chore: add coverage to snapshotted tasks

Author: fmenezes

.github/workflows/e2e-tests.yml

@@ -28,7 +28,7 @@ jobs:
           - atlas,datafederation,db
           - atlas,datafederation,privatenetwork
           - atlas,datafederation,querylimits
-          - atlas,decrypt
+          # - atlas,decrypt # requires live calls to GCP/AWS/Azure
           # - atlas,deployments,atlasclusters # one assertion connects to DB (needs live mode)
           # - atlas,deployments,local,auth,deprecated # needs docker to run
           # - atlas,deployments,local,auth,new # needs docker to run
@@ -56,6 +56,7 @@ jobs:
           - brew
           - config
           - iam
+          # - atlas,iam # need to add
           - kubernetes
     steps:
       - uses: GitHubSecurityLab/actions-permissions/monitor@v1
@@ -184,12 +185,6 @@ jobs:
           pattern: snapshots_*
           path: test/e2e/.snapshots
           merge-multiple: true
-      - name: Upload artifact
-        uses: actions/[email protected]
-        with:
-          name: snapshots
-          path: test/e2e/.snapshots
-          include-hidden-files: true
       - name: Find JIRA ticket
         id: find
         uses: mongodb/apix-action/find-jira@dd1d8b713effb9ac4972a3318b8e2f03b8a6d8ce
@@ -250,8 +245,6 @@ jobs:
           base: master
           branch: ${{ env.JIRA_KEY }}
           labels: |
-            dependencies
-            go
             auto_close_jira
           body: |
             ## Proposed changes

.github/workflows/update-e2e-tests.yml

@@ -122,10 +122,6 @@ gen-docs-metadata: apply-overlay ## Generate docs metadata
 	@echo "==> Generating docs metadata"
 	go run ./tools/cmd/api-generator --spec ./tools/internal/specs/spec-with-overlays.yaml --output-type metadata > ./tools/cmd/docs/metadata.go
 
-.PHONY: otel
-otel: ## Generate code
-	go run ./tools/cmd/otel $(SPAN) --attr $(ATTRS)
-
 .PHONY: gen-mocks
 gen-mocks: ## Generate mocks
 	@echo "==> Generating mocks"
@@ -158,19 +154,24 @@ unit-test: ## Run unit-tests
 unit-test: export DO_NOT_TRACK=1
 unit-test: export E2E_SKIP_CLEANUP=true
 unit-test: export UPDATE_SNAPSHOTS=false
-unit-test: export MONGODB_ATLAS_ORG_ID=5f0f5b3e0f2912c8b8f3b9b9
-unit-test: export MONGODB_ATLAS_PROJECT_ID=5f0f5b3e0f2912c8b8f3b9b9
+unit-test: export MONGODB_ATLAS_ORG_ID=5efda682a3f2ed2e7dd6cde4
+unit-test: export MONGODB_ATLAS_PROJECT_ID=5efda6aea3f2ed2e7dd6ce05
 unit-test: export MONGODB_ATLAS_PRIVATE_API_KEY=12345678-abcd-ef01-2345-6789abcdef01
 unit-test: export MONGODB_ATLAS_PUBLIC_API_KEY=ABCDEF01
 unit-test: export MONGODB_ATLAS_OPS_MANAGER_URL=http://localhost:8080
 unit-test: export MONGODB_ATLAS_SERVICE=cloud
-unit-test: export IDENTITY_PROVIDER_ID=5f0f5b3e0f2912c8b8f3b9b9
-unit-test: export E2E_CLOUD_ROLE_ID=5f0f5b3e0f2912c8b8f3b9b9
-unit-test: export E2E_TEST_BUCKET=test-bucket
-unit-test: export E2E_FLEX_INSTANCE_NAME=instance_name
+unit-test: export IDENTITY_PROVIDER_ID=6627fbb7bb5b243e1ebca816
+unit-test: export E2E_CLOUD_ROLE_ID=67c048c782064d313e883ab9
+unit-test: export E2E_TEST_BUCKET=mongocli-e2e-tests
+unit-test: export E2E_FLEX_INSTANCE_NAME=doNotDeleteUsedForE2ETest
+unit-test: export BINGOCOVERDIR?=$(GOCOVERDIR)
+unit-test: export MONGODB_ATLAS_SKIP_UPDATE_CHECK=yes
 unit-test: build-debug
 	@echo "==> Running unit tests..."
-	$(TEST_CMD) -parallel $(E2E_PARALLEL) --tags="$(UNIT_TAGS)" -cover -coverprofile $(COVERAGE) -count=1 ./...
+	@rm -rf $(GOCOVERDIR)/*
+	@touch $(GOCOVERDIR)/.gitkeep
+	$(TEST_CMD) --tags="$(UNIT_TAGS)" -cover -count=1 ./... -test.gocoverdir=$(GOCOVERDIR)
+	@go tool covdata textfmt -i=$(GOCOVERDIR) -o $(COVERAGE)
 
 .PHONY: install
 install: ## Install a binary in $GOPATH/bin

Makefile

@@ -148,91 +148,6 @@ functions:
           DO_NOT_TRACK: "1"
           TEST_CMD: gotestsum --junitfile e2e-tests.xml --format standard-verbose --
         command: make e2e-test
-    - command: archive.targz_pack
-      params:
-        target: src/github.com/mongodb/mongodb-atlas-cli/coverage.tgz
-        source_dir: src/github.com/mongodb/mongodb-atlas-cli/cov
-        include:
-          - '*'
-        exclude_files:
-          - .gitkeep
-    - command: s3.put
-      params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        local_file: src/github.com/mongodb/mongodb-atlas-cli/coverage.tgz
-        remote_file: ${project}/dist/${revision}_${created_at}/atlascli/cov/${build_variant}_${task_name}.coverage.tgz
-        bucket: mongodb-mongocli-build
-        permissions: public-read
-        content_type: ${content_type|application/json}
-        display_name: internal-bucket coverage.tgz
-  "merge cov":
-    - command: subprocess.exec
-      params:
-        <<: *go_options
-        binary: build/ci/merge-cov.sh
-    - command: archive.targz_pack
-      params:
-        target: src/github.com/mongodb/mongodb-atlas-cli/coverage.tgz
-        source_dir: src/github.com/mongodb/mongodb-atlas-cli/
-        include:
-          - 'coverage.out'
-          - 'cov/merged/*'
-        exclude_files:
-          - .gitkeep
-    - command: shell.exec
-      params:
-        <<: *go_options
-        shell: bash
-        script: |
-          set -Eeou pipefail
-          PERCENTAGE=$(go tool cover -func=coverage.out | grep total: | awk '{print $3}' | sed 's/%//')
-          COUNT=$(ls -1 cov/*.tgz | wc -l)
-          cat <<EOF > expansions.yaml
-          percentage: $PERCENTAGE
-          count: $COUNT
-          EOF
-    - command: s3.put
-      params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        local_file: src/github.com/mongodb/mongodb-atlas-cli/expansions.yaml
-        remote_file: ${project}/dist/${revision}_${created_at}/atlascli/expansions.yaml
-        bucket: mongodb-mongocli-build
-        permissions: public-read
-        content_type: ${content_type|application/yaml}
-        display_name: internal-bucket expansions.yaml
-    - command: expansions.update
-      params:
-        ignore_missing_file: true
-        file: src/github.com/mongodb/mongodb-atlas-cli/expansions.yaml
-    - command: subprocess.exec
-      params:
-        <<: *go_options
-        binary: rm
-        args:
-          - -f
-          - expansions.yaml
-    - command: s3.put
-      params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        local_file: src/github.com/mongodb/mongodb-atlas-cli/coverage.tgz
-        remote_file: ${project}/dist/${revision}_${created_at}/atlascli/cov/e2e.coverage.tgz
-        bucket: mongodb-mongocli-build
-        permissions: public-read
-        content_type: ${content_type|application/json}
-        display_name: internal-bucket e2e.coverage.tgz
-    - command: s3.put
-      params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        local_file: src/github.com/mongodb/mongodb-atlas-cli/coverage.out
-        remote_file: ${project}/dist/${revision}_${created_at}/atlascli/cov/e2e.coverage.out
-        bucket: mongodb-mongocli-build
-        permissions: public-read
-        content_type: ${content_type|application/json}
-        display_name: internal-bucket e2e.coverage.out
   "install gotestsum":
     - command: shell.exec
       type: setup
@@ -512,26 +427,6 @@ functions:
         args:
           - -f
           - expansions.yaml
-  "otel":
-    - command: subprocess.exec
-      params:
-        <<: *go_options
-        include_expansions_in_env:
-          - go_base_path
-          - go_proxy
-          - workdir
-          - project_id
-          - project_identifier
-          - otel_trace_id
-          - otel_parent_id
-          - otel_collector_endpoint
-        env:
-          <<: *go_env
-          SPAN: ${span}
-          ATTRS: ${attr}
-        binary: make
-        args:
-          - otel
 tasks:
   - name: compile
     tags: ["code_health"]
@@ -1682,27 +1577,6 @@ tasks:
           user: atlascli
           identity_file: ${workdir}/src/github.com/mongodb/mongodb-atlas-cli/build/ci/terraform/id_rsa
           cmd: "powershell -ExecutionPolicy Bypass -File C:\\Users\\atlascli\\win_test.ps1 -goproxy ${go_proxy} -revision ${github_commit}"
-  - name: coverage
-    tags: ["coverage"]
-    depends_on:
-      - name: ".e2e"
-        variant: "* !.cron"
-        status: '*'
-    commands:
-      - command: shell.exec
-        params:
-          <<: *go_options
-          env:
-            <<: *go_env
-            AWS_ACCESS_KEY_ID: ${aws_key}
-            AWS_SECRET_ACCESS_KEY: ${aws_secret}
-          script: |
-            aws s3 sync s3://mongodb-mongocli-build/${project}/dist/${revision}_${created_at}/atlascli/cov/ ./cov/
-      - func: "merge cov"
-      - func: "otel"
-        vars:
-          span: "coverage"
-          attr: "total=${percentage},count=${count}"
   - name: snyk_monitor
     tags:
     - snyk
@@ -2026,14 +1900,6 @@ buildvariants:
       <<: *go_linux_version
     tasks:
       - name: ".packer .windows"
-  - name: coverage
-    display_name: "Coverage"
-    run_on:
-      - rhel80-small
-    expansions:
-      <<: *go_linux_version
-    tasks:
-      - name: ".coverage"
   - name: snyk
     display_name: Snyk
     allowed_requesters: ["patch", "ad_hoc", "github_pr"]