From 48cc4748f5823218bd77a9e9124e38989d8293f8 Mon Sep 17 00:00:00 2001 From: Harsh4902 Date: Tue, 5 Aug 2025 21:58:21 +0530 Subject: [PATCH] Fix: changes command name from 'microcks-cli' to 'microcks' in Dockerfile and tekton tasks as well as modified flags as per the requirements. Signed-off-by: Harsh4902 --- build/Dockerfile | 6 +++--- tekton/microcks-import-task.yaml | 4 ++-- tekton/microcks-test-customcerts-task.yaml | 2 +- tekton/microcks-test-task.yaml | 4 ++-- tekton/microcks-test-with-secret.yaml | 4 ++-- tekton/v1alpha1/microcks-test-customcerts-task.yaml | 2 +- tekton/v1alpha1/microcks-test-task.yaml | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 6c08ad7..a002353 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app ARG TARGETOS ARG TARGETARCH RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \ - go build -ldflags="-s -w" -o microcks-cli github.com/microcks/microcks-cli + go build -ldflags="-s -w" -o microcks github.com/microcks/microcks-cli # Build image FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5-1742914212 @@ -19,12 +19,12 @@ LABEL maintainer="Laurent Broudoux " \ org.opencontainers.image.documentation="https://github.com/microcks/microcks-cli" \ io.artifacthub.package.readme-url="https://raw.githubusercontent.com/microcks/microcks-cli/master/README.md" -ENV CLI=/usr/local/bin/microcks-cli \ +ENV CLI=/usr/local/bin/microcks \ USER_UID=1001 \ USER_NAME=microcks-cli # install cli binary -COPY --from=build-env /app/microcks-cli ${CLI} +COPY --from=build-env /app/microcks ${CLI} COPY build/bin /usr/local/bin RUN /usr/local/bin/user_setup diff --git a/tekton/microcks-import-task.yaml b/tekton/microcks-import-task.yaml index dcbcf84..ec25de9 100644 --- a/tekton/microcks-import-task.yaml +++ b/tekton/microcks-import-task.yaml @@ -23,10 +23,10 @@ spec: args: - '-c' - >- - microcks-cli import '$(params.specificationFilesList)' \ + microcks import '$(params.specificationFilesList)' \ --microcksURL=$(params.microcksURL) \ --keycloakClientId=$KEYCLOAK_CLIENT_ID --keycloakClientSecret=$KEYCLOAK_CLIENT_SECRET \ - --insecure' + --insecure-tls env: - name: KEYCLOAK_CLIENT_ID valueFrom: diff --git a/tekton/microcks-test-customcerts-task.yaml b/tekton/microcks-test-customcerts-task.yaml index 7838259..84586b9 100644 --- a/tekton/microcks-test-customcerts-task.yaml +++ b/tekton/microcks-test-customcerts-task.yaml @@ -52,7 +52,7 @@ spec: args: - '-c' - >- - microcks-cli test '$(params.apiNameAndVersion)' $(params.testEndpoint) $(params.runner) \ + microcks test '$(params.apiNameAndVersion)' $(params.testEndpoint) $(params.runner) \ --microcksURL=$(params.microcksURL) --waitFor=$(params.waitFor) \ --keycloakClientId=$(params.keycloakClientId) --keycloakClientSecret=$(params.keycloakClientSecret) \ --caCerts=/var/run/secrets/customcerts/ca.crt --filteredOperations='$(params.filteredOperations)' --operationsHeaders='$(params.operationsHeaders)' diff --git a/tekton/microcks-test-task.yaml b/tekton/microcks-test-task.yaml index e09506d..db4964a 100644 --- a/tekton/microcks-test-task.yaml +++ b/tekton/microcks-test-task.yaml @@ -42,10 +42,10 @@ spec: args: - '-c' - >- - microcks-cli test '$(params.apiNameAndVersion)' $(params.testEndpoint) $(params.runner) \ + microcks test '$(params.apiNameAndVersion)' $(params.testEndpoint) $(params.runner) \ --microcksURL=$(params.microcksURL) --waitFor=$(params.waitFor) --secretName='$(params.secretName)' \ --keycloakClientId=$KEYCLOAK_CLIENT_ID --keycloakClientSecret=$KEYCLOAK_CLIENT_SECRET \ - --insecure --operationsHeaders='$(params.operationsHeaders)' + --insecure-tls --operationsHeaders='$(params.operationsHeaders)' env: - name: KEYCLOAK_CLIENT_ID valueFrom: diff --git a/tekton/microcks-test-with-secret.yaml b/tekton/microcks-test-with-secret.yaml index e4617a2..85a52ca 100644 --- a/tekton/microcks-test-with-secret.yaml +++ b/tekton/microcks-test-with-secret.yaml @@ -42,10 +42,10 @@ spec: args: - '-c' - >- - microcks-cli test '$(params.apiNameAndVersion)' $(params.testEndpoint) $(params.runner) \ + microcks test '$(params.apiNameAndVersion)' $(params.testEndpoint) $(params.runner) \ --microcksURL=$(params.microcksURL) --waitFor=$(params.waitFor) --secretName='$(params.secretName)' \ --keycloakClientId=$KEYCLOAK_CLIENT_ID --keycloakClientSecret=$KEYCLOAK_CLIENT_SECRET \ - --insecure --operationsHeaders='$(params.operationsHeaders)' + --insecure-tls --operationsHeaders='$(params.operationsHeaders)' env: - name: KEYCLOAK_CLIENT_ID valueFrom: diff --git a/tekton/v1alpha1/microcks-test-customcerts-task.yaml b/tekton/v1alpha1/microcks-test-customcerts-task.yaml index 1d5118b..26c5788 100644 --- a/tekton/v1alpha1/microcks-test-customcerts-task.yaml +++ b/tekton/v1alpha1/microcks-test-customcerts-task.yaml @@ -49,7 +49,7 @@ spec: args: - '-c' - >- - microcks-cli test '$(inputs.params.apiNameAndVersion)' $(inputs.params.testEndpoint) $(inputs.params.runner) \ + microcks test '$(inputs.params.apiNameAndVersion)' $(inputs.params.testEndpoint) $(inputs.params.runner) \ --microcksURL=$(inputs.params.microcksURL) --waitFor=$(inputs.params.waitFor) \ --keycloakClientId=$(inputs.params.keycloakClientId) --keycloakClientSecret=$(inputs.params.keycloakClientSecret) \ --caCerts=/var/run/secrets/customcerts/ca.crt --operationsHeaders='$(inputs.params.operationsHeaders)' diff --git a/tekton/v1alpha1/microcks-test-task.yaml b/tekton/v1alpha1/microcks-test-task.yaml index f8200cb..4a4376f 100644 --- a/tekton/v1alpha1/microcks-test-task.yaml +++ b/tekton/v1alpha1/microcks-test-task.yaml @@ -43,7 +43,7 @@ spec: args: - '-c' - >- - microcks-cli test '$(inputs.params.apiNameAndVersion)' $(inputs.params.testEndpoint) $(inputs.params.runner) \ + microcks test '$(inputs.params.apiNameAndVersion)' $(inputs.params.testEndpoint) $(inputs.params.runner) \ --microcksURL=$(inputs.params.microcksURL) --waitFor=$(inputs.params.waitFor) \ --keycloakClientId=$(inputs.params.keycloakClientId) --keycloakClientSecret=$(inputs.params.keycloakClientSecret) \ - --insecure --operationsHeaders='$(inputs.params.operationsHeaders)' \ No newline at end of file + --insecure-tls --operationsHeaders='$(inputs.params.operationsHeaders)' \ No newline at end of file