updates

pseudo-su · Jan 13, 2024 · fba8667 · fba8667
1 parent c9a1494
commit fba8667
Show file tree

Hide file tree

Showing 76 changed files with 7,809 additions and 2,344 deletions.
diff --git a/.dockerignore → .containerignore b/.dockerignore → .containerignore
diff --git a/.github/workflows/_build-and-verify.yaml b/.github/workflows/_build-and-verify.yaml
@@ -19,9 +19,9 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup
         with:
-          go-enabled: true
-          java-enabled: true
-          app-deps-enabled: true
+          go-enabled: false
+          java-enabled: false
+          app-deps-enabled: false
           tool-deps-enabled: true
 
   verify:
@@ -112,6 +112,9 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - cache-setup
+    env:
+      # TODO: use podman compose https://github.com/redhat-actions/buildah-build/issues/116#issuecomment-1890340223
+      DEVSTACK_COMPOSE_TOOL: docker-compose
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -133,10 +136,12 @@ jobs:
       - name: Run integration tests
         shell: bash
         run: |
-          make test.integration
+          make test.integration.report
 
       - name: Capture coverage reports
         shell: bash
+        env:
+          TEST_SUITE: test.integration
         run: |
           make devstack.capture-coverage-reports
 

diff --git a/.github/workflows/_package-and-publish.yaml b/.github/workflows/_package-and-publish.yaml
@@ -11,12 +11,14 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   package-and-publish:
     name: 'Package and publish'
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        image: [frontdoor, worker, mocks]
     permissions:
       contents: read
       packages: write
@@ -25,52 +27,40 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Log in to the Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        uses: redhat-actions/podman-login@v1
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract metadata (tags, labels) for frontdoor
-        id: service-frontdoor-meta
+      - name: Extract metadata (tags, labels) for ${{matrix.image}}
+        id: service-meta
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
-          images: ${{ inputs.registry }}/${{ github.repository }}/service-frontdoor
+          images: ${{ inputs.registry }}/${{ github.repository }}/service-${{matrix.image}}
           tags: |
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=raw,value=latest,enable={{is_default_branch}}
 
-      - name: Extract metadata (tags, labels) for worker
-        id: service-worker-meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
-        with:
-          images: ${{ inputs.registry }}/${{ github.repository }}/service-worker
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=latest,enable={{is_default_branch}}
-
-      - name: Build and push frontdoor image
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+      - name: Build ${{matrix.image}} image
+        id: build-image
+        uses: redhat-actions/buildah-build@v2
         with:
-          context: .
-          push: true
-          tags: ${{ steps.service-frontdoor-meta.outputs.tags }}
-          labels: ${{ steps.service-frontdoor-meta.outputs.labels }}
+          tags: ${{ steps.service-meta.outputs.tags }}
+          labels: ${{ steps.service-meta.outputs.labels }}
+          containerfiles: |
+            ./Containerfile.alt
           build-args: |
-            entrypoint=modules/frontdoor/cmd/frontdoor
+            entrypoint=modules/${{matrix.image}}/cmd/${{matrix.image}}
+          extra-args: |
+            --target runtime
 
-      - name: Build and push worker image
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+      - name: Push ${{matrix.image}} image
+        id: push-image
+        uses: redhat-actions/push-to-registry@v2
         with:
-          context: .
-          push: true
-          tags: ${{ steps.service-worker-meta.outputs.tags }}
-          labels: ${{ steps.service-worker-meta.outputs.labels }}
-          build-args: |
-            entrypoint=modules/worker/cmd/worker
+          image: ${{ steps.build-image.outputs.image }}
+          tags: ${{ steps.build-image.outputs.tags }}
diff --git a/.github/workflows/feature-branch.yaml b/.github/workflows/feature-branch.yaml
@@ -43,21 +43,13 @@ jobs:
     needs:
       - workflow-variables
 
-  release-dryrun-dev:
-    name: dryrun-dev
+  release-dryrun-qa:
+    name: dryrun-qa
     uses: ./.github/workflows/_release-dryrun.yaml
     needs:
       - workflow-variables
     with:
-      env: dev
-
-  release-dryrun-test:
-    name: dryrun-test
-    uses: ./.github/workflows/_release-dryrun.yaml
-    needs:
-      - workflow-variables
-    with:
-      env: test
+      env: qa
 
   release-dryrun-prod:
     name: dryrun-prod
@@ -67,23 +59,12 @@ jobs:
     with:
       env: prod
 
-  release-dev:
-    name: release-dev
-    uses: ./.github/workflows/_release.yaml
-    needs:
-      - workflow-variables
-      - package-and-publish
-    with:
-      env: dev
-      smoke-tests-enabled: true
-
-  release-test:
-    name: release-test
+  release-qa:
+    name: release-qa
     uses: ./.github/workflows/_release.yaml
     needs:
       - workflow-variables
       - package-and-publish
-      - release-dev
     with:
-      env: test
+      env: qa
       smoke-tests-enabled: true
diff --git a/.github/workflows/main-branch.yaml b/.github/workflows/main-branch.yaml
@@ -41,33 +41,23 @@ jobs:
     needs:
       - workflow-variables
 
-  release-dev:
-    name: release-dev
+  release-qa:
+    name: release-qa
     uses: ./.github/workflows/_release.yaml
     needs:
       - workflow-variables
       - build-and-verify
       - package-and-publish
     with:
-      env: dev
-      smoke-tests-enabled: true
-
-  release-test:
-    name: release-test
-    uses: ./.github/workflows/_release.yaml
-    needs:
-      - workflow-variables
-      - release-dev
-    with:
-      env: test
+      env: qa
       smoke-tests-enabled: true
 
   release-prod:
     name: release-prod
     uses: ./.github/workflows/_release.yaml
     needs:
       - workflow-variables
-      - release-test
+      - release-qa
     with:
       env: prod
       smoke-tests-enabled: false
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,6 @@ __debug_bin*
 /*.session.sql
 
 /reports/**
+
+# Test artifacts
+/test-harness/suites/**/ginkgo.report
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -52,6 +52,8 @@ linters-settings:
             desc: not allowed, use slog
           - pkg: "go.uber.org/zap"
             desc: not allowed, use slog
+          - pkg: "istio.io/pkg/log"
+            desc: not allowed, use slog
       error_rules:
         deny:
           - pkg: "github.com/go-errors/errors"

diff --git a/.mockery.yaml b/.mockery.yaml
@@ -2,6 +2,10 @@ with-expecter: true
 inpackage: true
 dir: "{{.InterfaceDir}}"
 outpkg: "{{.PackageName}}"
+replace-type:
+  - go.temporal.io/sdk/internal.StartWorkflowOptions=sdkclient:go.temporal.io/sdk/client.StartWorkflowOptions
+  - go.temporal.io/sdk/internal.WorkflowRun=sdkclient:go.temporal.io/sdk/client.WorkflowRun
+  - go.temporal.io/sdk/internal.Context=workflow:go.temporal.io/sdk/workflow.Context
 packages:
   github.com/pseudo-su/golang-temporal-service-template/modules/worker/pkg/workflowclient:
     interfaces:
@@ -18,6 +22,28 @@ packages:
           mockname: MockTemporalEncodedValue
           filename: mock_TemporalEncodedValue.go
 
+  go.temporal.io/sdk/internal:
+    config:
+      dir: "modules/testing-tools/vendormocks"
+    interfaces:
+      WorkflowRun:
+        config:
+          inpackage: false
+          outpkg: "vendormocks"
+          mockname: MockTemporalWorkflowRun
+          filename: mock_TemporalWorkflowRun.go
+
+  go.temporal.io/sdk/client:
+    config:
+      dir: "modules/testing-tools/vendormocks"
+    interfaces:
+      Client:
+        config:
+          inpackage: false
+          outpkg: "vendormocks"
+          mockname: MockTemporalClient
+          filename: mock_TemporalClient.go
+
   google.golang.org/grpc/health/grpc_health_v1:
     config:
       dir: "modules/testing-tools/vendormocks"

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -2,6 +2,7 @@
   // https://go.microsoft.com/fwlink/?LinkId=827846
   "recommendations": [
     "golang.go",
+    "joselitofilho.ginkgotestexplorer",
     "mikestead.dotenv",
     "mechatroner.rainbow-csv",
     "editorconfig.editorconfig",

diff --git a/Dockerfile → Containerfile b/Dockerfile → Containerfile
@@ -14,50 +14,39 @@ RUN env GOBIN=/builddir go install github.com/grpc-ecosystem/grpc-health-probe@l
 
 # Copy across
 COPY go.work go.work.sum ./
-COPY modules/worker/go.mod modules/worker/go.sum ./modules/worker/
 COPY modules/frontdoor/go.mod modules/frontdoor/go.sum ./modules/frontdoor/
+COPY modules/mocks/go.mod modules/mocks/go.sum ./modules/mocks/
+COPY modules/service-cli/go.mod modules/service-cli/go.sum ./modules/service-cli/
 COPY modules/service-pkg/go.mod modules/service-pkg/go.sum ./modules/service-pkg/
 COPY modules/testing-tools/go.mod modules/testing-tools/go.sum ./modules/testing-tools/
+COPY modules/worker/go.mod modules/worker/go.sum ./modules/worker/
 COPY test-harness/go.mod test-harness/go.sum ./test-harness/
 
 # Install go application dependencies
 RUN --mount=type=cache,target=/go/pkg/mod/ \
     go mod download -x
 
-FROM builder-base AS builder-instrumented
+FROM builder-base AS builder
 
 ARG entrypoint
+ARG gobuildopts=
 
+ADD . .
 RUN --mount=type=cache,target=/go/pkg/mod/ \
     --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=bind,target=. \
-  CGO_ENABLED=0 go build -cover -v -o /builddir/service ./$entrypoint
+    CGO_ENABLED=0 go build ${gobuildopts} -v -o /builddir/service ./$entrypoint
 
-FROM builder-base as builder
-
-ARG entrypoint
-
-RUN --mount=type=cache,target=/go/pkg/mod/ \
-    --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=bind,target=. \
-    CGO_ENABLED=0 go build -v -o /builddir/service ./$entrypoint
+FROM gcr.io/distroless/static AS runtime-base
 
-FROM gcr.io/distroless/static as runtime-base
+USER nonroot
 
 COPY --from=builder-base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder-base /builddir/grpc-health-probe /bin
 
-# non root
-USER 65532
-
-FROM runtime-base as runtime-instrumented
-
-COPY --from=builder-instrumented /builddir/service /bin
-
-ENTRYPOINT ["/bin/service"]
-
 FROM runtime-base AS runtime
 
+USER nonroot
+
 COPY --from=builder /builddir/service /bin
 
 ENTRYPOINT ["/bin/service"]