chore: update references to ec-cli

This commit updates references to both the repository, from
`enterprise-contract/ec-cli` to `conforma/cli`, as well as ec itself
(from `ec-cli` to `cli` or `ec` as appropriate) to reflect the move from
the `enterprise-contract` org to the `conforma` org along with the
renaming of the repository from `ec-cli` to `cli`.

Ref: EC-1110

Signed-off-by: Rob Nester <rnester@redhat.com>

Author: robnester-rh

.github/ISSUE_TEMPLATE/config.yaml

@@ -18,7 +18,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Community Forum
-    url: https://github.com/enterprise-contract/ec-cli/discussions
+    url: https://github.com/conforma/cli/discussions
     about: Please ask and answer questions here.
   - name: Community Chat
     url: https://join.slack.com/t/conforma-dev/shared_invite/zt-26l68e6wj-apw7c55CsDtd6Q9TgtiGuw

.github/workflows/checks-sealights.yaml

@@ -101,7 +101,7 @@ jobs:
           echo "[Sealights] Configuring SeaLights to scan the pull request branch"
           echo "Latest commit sha: ${LATEST_COMMIT_SHA}"
           echo "PR Number: ${PULL_REQUEST_NUMBER}"
-          ./slcli config create-pr-bsid --app ec-cli --target-branch "main" --pull-request-number ${PULL_REQUEST_NUMBER} --latest-commit ${LATEST_COMMIT_SHA} --repository-url https://github.com/enterprise-contract/ec-cli.git
+          ./slcli config create-pr-bsid --app cli --target-branch "main" --pull-request-number ${PULL_REQUEST_NUMBER} --latest-commit ${LATEST_COMMIT_SHA} --repository-url https://github.com/conforma/cli.git
         env:
           PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
           LATEST_COMMIT_SHA: ${{github.event.pull_request.head.sha}}
@@ -110,15 +110,15 @@ jobs:
         if: env.on-event == 'push'
         run: |
           echo "[Sealights] Configuring SeaLights to scan the main branch after pull request was closed"
-          ./slcli config create-bsid --app ec-cli --branch main --build ${LATEST_COMMIT_SHA}
+          ./slcli config create-bsid --app cli --branch main --build ${LATEST_COMMIT_SHA}
         env:
           LATEST_COMMIT_SHA: ${{ github.sha }}
 
       - name: Run the SeaLights scan
         id: sealights-scan
         run: |
           echo "[Sealights] Running the SeaLights scan"
-          ./slcli scan --bsid buildSessionId.txt  --path-to-scanner ./slgoagent --workspacepath ./ --scm git --scmBaseUrl https://github.com/enterprise-contract/ec-cli.git --scmVersion “0” --scmProvider github
+          ./slcli scan --bsid buildSessionId.txt  --path-to-scanner ./slgoagent --workspacepath ./ --scm git --scmBaseUrl https://github.com/conforma/cli.git --scmVersion “0” --scmProvider github
           echo bsid=$(< buildSessionId.txt) | tee -a "$GITHUB_OUTPUT"
       - name: clean all SeaLights secret stuff
         run: |

.github/workflows/release.yaml

@@ -42,7 +42,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
           GH_COBRA: 1
         run: |
-          echo head_sha=$(gh api /repos/enterprise-contract/ec-cli/git/matching-refs/heads/main --jq '.[0].object.sha') | tee -a "$GITHUB_OUTPUT"
+          echo head_sha=$(gh api /repos/conforma/cli/git/matching-refs/heads/main --jq '.[0].object.sha') | tee -a "$GITHUB_OUTPUT"
       - name: Timestamp
         id: timestamp
         run: |
@@ -60,7 +60,7 @@ jobs:
     if: ${{ (github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_sha == needs.info.outputs.head_sha) || github.event_name == 'workflow_dispatch' }}
 
     env:
-      IMAGE_REPO: quay.io/enterprise-contract/ec-cli
+      IMAGE_REPO: quay.io/conforma/cli
       TAG: ${{ github.sha }}
       TAG_TIMESTAMP: ${{ github.sha }}-${{ needs.info.outputs.timestamp }}
 
@@ -116,11 +116,11 @@ jobs:
       - name: Registry login (quay.io/enterprise-contract)
         run: podman login -u ${{ secrets.BUNDLE_PUSH_USER_EC  }} -p ${{ secrets.BUNDLE_PUSH_PASS_EC }} quay.io
 
-      - name: Create and push image (quay.io/enterprise-contract/ec-cli)
+      - name: Create and push image (quay.io/conforma/cli)
         run: make dist-image-push IMAGE_TAG=$TAG IMAGE_REPO=$IMAGE_REPO ADD_IMAGE_TAG="snapshot $TAG_TIMESTAMP"
 
       # verify ec works in the image and show the version
-      - name: verify the ec-cli image
+      - name: verify the ec image
         env:
           IMAGE_TAG: snapshot
         run: make verify-image

.golangci.yaml

@@ -30,7 +30,7 @@ linters-settings:
     sections:
       - standard
       - default
-      - prefix(github.com/enterprise-contract/ec-cli)
+      - prefix(github.com/conforma/cli)
 
 issues:
   exclude-rules:

Dockerfile

@@ -51,7 +51,7 @@ ARG TARGETARCH
 ARG CLI_NAME="Conforma"
 
 LABEL \
-  name="ec-cli" \
+  name="ec" \
   description="${CLI_NAME} verifies and checks supply chain artifacts to ensure they meet security and business policies." \
   io.k8s.description="${CLI_NAME} verifies and checks supply chain artifacts to ensure they meet security and business policies." \
   summary="Provides the binaries for downloading the ${CLI_NAME} CLI. Also used as a runner image for Tekton tasks." \

Dockerfile.dist

@@ -51,13 +51,13 @@ ARG TARGETARCH
 ARG CLI_NAME="Enterprise Contract"
 
 LABEL \
-  name="ec-cli" \
+  name="ec" \
   description="${CLI_NAME} verifies and checks supply chain artifacts to ensure they meet security and business policies." \
   io.k8s.description="${CLI_NAME} verifies and checks supply chain artifacts to ensure they meet security and business policies." \
   summary="Provides the binaries for downloading the ${CLI_NAME} CLI. Also used as a runner image for Tekton tasks." \
   io.k8s.display-name="${CLI_NAME}" \
   io.openshift.tags="rhtas rhtap trusted-artifact-signer trusted-application-pipeline enterprise-contract conforma ec opa cosign sigstore" \
-  com.redhat.component="ec-cli"
+  com.redhat.component="ec"
 
 # Install tools we want to use in the Tekton task
 RUN microdnf upgrade --assumeyes --nodocs --setopt=keepcache=0 --refresh && microdnf -y --nodocs --setopt=keepcache=0 install gzip jq ca-certificates

Makefile

@@ -54,7 +54,7 @@ BUILD_BIN_SUFFIX=$(if $(DEBUG_BUILD),_debug,)
 $(ALL_SUPPORTED_OS_ARCH): generate ## Build binaries for specific platform/architecture, e.g. make dist/ec_linux_amd64
 	@GOOS=$(word 2,$(subst _, ,$(notdir $@))); \
 	GOARCH=$(word 3,$(subst _, ,$(notdir $@))); \
-	GOOS=$${GOOS} GOARCH=$${GOARCH} CGO_ENABLED=0 go build $(BUILD_TRIMPATH) $(BUILD_GC_FLAGS) -ldflags="$(BUILD_LD_FLAGS) -X github.com/enterprise-contract/ec-cli/internal/version.Version=$(VERSION)" -o dist/ec_$${GOOS}_$${GOARCH}$(BUILD_BIN_SUFFIX); \
+	GOOS=$${GOOS} GOARCH=$${GOARCH} CGO_ENABLED=0 go build $(BUILD_TRIMPATH) $(BUILD_GC_FLAGS) -ldflags="$(BUILD_LD_FLAGS) -X github.com/conforma/cli/internal/version.Version=$(VERSION)" -o dist/ec_$${GOOS}_$${GOARCH}$(BUILD_BIN_SUFFIX); \
 	sha256sum -b dist/ec_$${GOOS}_$${GOARCH}$(BUILD_BIN_SUFFIX) > dist/ec_$${GOOS}_$${GOARCH}$(BUILD_BIN_SUFFIX).sha256
 
 .PHONY: dist
@@ -210,7 +210,7 @@ lint-fix: ## Fix linting issues automagically
 # We don't apply the fixes from the internal (error handling) linter.
 # TODO: fix the outstanding error handling lint issues and enable the fixer
 #	@go run -modfile tools/go.mod ./internal/lint -fix $$(go list ./... | grep -v '/acceptance/')
-	@go run -modfile tools/go.mod github.com/daixiang0/gci write -s standard -s default -s "prefix(github.com/enterprise-contract/ec-cli)" .
+	@go run -modfile tools/go.mod github.com/daixiang0/gci write -s standard -s default -s "prefix(github.com/conforma/cli)" .
 
 node_modules: package-lock.json
 	@npm ci
@@ -238,19 +238,19 @@ go-mod-lint:
 ##@ Pushing images
 
 IMAGE_TAG ?= latest
-IMAGE_REPO ?= quay.io/enterprise-contract/ec-cli
+IMAGE_REPO ?= quay.io/conforma/cli
 .PHONY: build-image
-build-image: image_$(BUILD_IMG_ARCH) ## Build container image with ec-cli
+build-image: image_$(BUILD_IMG_ARCH) ## Build container image with ec
 
 .PHONY: push-image
-push-image: push_image_$(BUILD_IMG_ARCH) ## Push ec-cli container image to default location
+push-image: push_image_$(BUILD_IMG_ARCH) ## Push ec container image to default location
 
 .PHONY: build-snapshot-image
-build-snapshot-image: push-image ## Build the ec-cli image and tag it with "snapshot"
+build-snapshot-image: push-image ## Build the ec image and tag it with "snapshot"
 	@podman tag $(IMAGE_REPO):$(IMAGE_TAG) $(IMAGE_REPO):snapshot
 
 .PHONY: push-snapshot-image
-push-snapshot-image: build-snapshot-image ## Push the ec-cli image with the "snapshot" tag
+push-snapshot-image: build-snapshot-image ## Push the ec image with the "snapshot" tag
 	@podman push $(PODMAN_OPTS) $(IMAGE_REPO):snapshot
 
 .PHONY: $(ALL_SUPPORTED_IMG_OS_ARCH)
@@ -318,7 +318,7 @@ dev: TASKS:=$(shell T=$$(mktemp) && yq e ".spec.steps[].image? = \"localhost:$(R
     tasks/verify-enterprise-contract/*/verify-enterprise-contract.yaml \
     tasks/verify-conforma-konflux-ta/*/verify-conforma-konflux-ta.yaml \
     | yq 'select(. != null)' > "$${T}" && echo "$${T}")
-dev: push-image task-bundle ## Push the ec-cli and v-e-c Task Bundle to the kind cluster setup via hack/setup-dev-environment.sh
+dev: push-image task-bundle ## Push the ec and v-e-c Task Bundle to the kind cluster setup via hack/setup-dev-environment.sh
 	@rm "$(TASKS)"
 
 TASK_TAG ?= latest

README.md

@@ -116,7 +116,7 @@ This issue may be resolved by adding the below entries in the `/etc/hosts` file:
 127.0.0.1 rekor.localhost
 ```
 
-This issue arises because the acceptance tests use ec-cli binaries built with `CGO_ENABLED=0`. This setting, [chosen for OS compatibility](https://github.com/enterprise-contract/ec-cli/pull/703), causes the program to use Go's native DNS resolver instead of the system's libc resolver ([learn more](https://go.dev/doc/go1.5#net)). Consequently, the binary is unable to resolve 2nd level localhost domains like `apiserver.localhost`, as the native Go DNS resolver does not support resolution for such names in the same way the system resolver does.
+This issue arises because the acceptance tests use ec binaries built with `CGO_ENABLED=0`. This setting, [chosen for OS compatibility](https://github.com/conforma/cli/pull/703), causes the program to use Go's native DNS resolver instead of the system's libc resolver ([learn more](https://go.dev/doc/go1.5#net)). Consequently, the binary is unable to resolve 2nd level localhost domains like `apiserver.localhost`, as the native Go DNS resolver does not support resolution for such names in the same way the system resolver does.
 
 [pol]: https://github.com/conforma/policy/
-[docs]: https://conforma.dev/docs/ec-cli/ec.html
+[docs]: https://conforma.dev/docs/cli/ec.html

acceptance/README.md

@@ -47,7 +47,7 @@ The `-tags` argument is for selecting acceptance test scenarios.
 
 Also notice that there are different ways of specifying the path to the
 acceptance tests. `./...` can only be be used if `-args` is NOT used. Use,
-`./acceptance` or `github.com/enterprise-contract/ec-cli/acceptance`
+`./acceptance` or `github.com/conforma/cli/acceptance`
 in such cases.
 
 Depending on your setup Testcontainer's ryuk container might need to be run as
@@ -68,7 +68,7 @@ reason `make acceptance` builds the binary prior to running the tests.)
 
 To use a debugger, like [delve](https://github.com/go-delve/delve), you must
 determine what part of the code is being debugged. If it's part of the
-acceptance module, `github.com/enterprise-contract/ec-cli/acceptance`, or
+acceptance module, `github.com/conforma/cli/acceptance`, or
 it is a dependency of the acceptance module, then the debugger can be invoked
 directly. However, if the code to be debugged is in any other module, first
 run the acceptance tests in `-persist` mode. The, scan the test logs for the

acceptance/acceptance_test.go

@@ -27,20 +27,20 @@ import (
 	"github.com/cucumber/godog"
 	"github.com/gkampitakis/go-snaps/snaps"
 
-	"github.com/enterprise-contract/ec-cli/acceptance/cli"
-	"github.com/enterprise-contract/ec-cli/acceptance/conftest"
-	"github.com/enterprise-contract/ec-cli/acceptance/crypto"
-	"github.com/enterprise-contract/ec-cli/acceptance/git"
-	"github.com/enterprise-contract/ec-cli/acceptance/image"
-	"github.com/enterprise-contract/ec-cli/acceptance/kubernetes"
-	"github.com/enterprise-contract/ec-cli/acceptance/log"
-	"github.com/enterprise-contract/ec-cli/acceptance/pipeline"
-	"github.com/enterprise-contract/ec-cli/acceptance/registry"
-	"github.com/enterprise-contract/ec-cli/acceptance/rekor"
-	"github.com/enterprise-contract/ec-cli/acceptance/tekton"
-	"github.com/enterprise-contract/ec-cli/acceptance/testenv"
-	"github.com/enterprise-contract/ec-cli/acceptance/tuf"
-	"github.com/enterprise-contract/ec-cli/acceptance/wiremock"
+	"github.com/conforma/cli/acceptance/cli"
+	"github.com/conforma/cli/acceptance/conftest"
+	"github.com/conforma/cli/acceptance/crypto"
+	"github.com/conforma/cli/acceptance/git"
+	"github.com/conforma/cli/acceptance/image"
+	"github.com/conforma/cli/acceptance/kubernetes"
+	"github.com/conforma/cli/acceptance/log"
+	"github.com/conforma/cli/acceptance/pipeline"
+	"github.com/conforma/cli/acceptance/registry"
+	"github.com/conforma/cli/acceptance/rekor"
+	"github.com/conforma/cli/acceptance/tekton"
+	"github.com/conforma/cli/acceptance/testenv"
+	"github.com/conforma/cli/acceptance/tuf"
+	"github.com/conforma/cli/acceptance/wiremock"
 )
 
 // NOTE: flags need to be initialized with the package in order to be recognized