Merge branch 'main' into APIGOV-26621

.github/workflows/build-discovery-agent-docker.yml

@@ -21,6 +21,13 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set output
+        id: vars
+        run: |
+          echo "date=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
+          echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+          echo "sdkversion=$(grep github.com/Axway/agent-sdk go.mod |  awk '{print $2}')" >> $GITHUB_OUTPUT
+          echo "commit=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v4
@@ -33,5 +40,11 @@ jobs:
           context: .
           file: build/discovery/Dockerfile
           push: true
+          build-args: |
+            time=${{ steps.vars.outputs.date }}
+            CGO_ENABLED=0
+            version=${{ steps.vars.outputs.tag }}
+            sdk_version=${{ steps.vars.outputs.sdkversion }}
+            commit_id=${{ steps.vars.outputs.commit }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-traceability-agent-docker.yml

@@ -21,6 +21,13 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set output
+        id: vars
+        run: |
+          echo "date=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
+          echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+          echo "sdkversion=$(grep github.com/Axway/agent-sdk go.mod |  awk '{print $2}')" >> $GITHUB_OUTPUT
+          echo "commit=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v4
@@ -33,5 +40,11 @@ jobs:
           context: .
           file: build/traceability/Dockerfile
           push: true
+          build-args: |
+            time=${{ steps.vars.outputs.date }}
+            CGO_ENABLED=0
+            version=${{ steps.vars.outputs.tag }}
+            sdk_version=${{ steps.vars.outputs.sdkversion }}
+            commit_id=${{ steps.vars.outputs.commit }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -21,7 +21,11 @@ bin/
 .run/
 *.log
 
-kong_discovery_agent.yml
-kong_traceability_agent.yml
+/kong_discovery_agent.yml
+/kong_traceability_agent.yml
 
 specs/
+
+secret.yaml
+overrides.yaml
+configmap.yaml

.gitlab-ci.yml

@@ -115,6 +115,18 @@ whitesource:on-schedule:
     - echo "Checking out ${GIT_TAG_PREFIX}${LATEST_TAG}"
     - git checkout ${GIT_TAG_PREFIX}${LATEST_TAG}
 
+blackduck:on-schedule:
+  extends: .blackduck
+  rules:
+    - !reference [.mirror-schedule-csr-rules, rules]
+  before_script:
+    - git config --global http.sslVerify false
+    - git config --global url."ssh://[email protected]".insteadOf "https://git.ecd.axway.org"''
+    - git fetch
+    - *get-latest-tag
+    - echo "Checking out ${GIT_TAG_PREFIX}${LATEST_TAG}"
+    - git checkout ${GIT_TAG_PREFIX}${LATEST_TAG}
+
 # overridden from csrjobs.yml because mirror repos like this one don't get merge events
 fortify:
   rules:
@@ -133,8 +145,6 @@ whitesource:
 blackduck:
   rules:
     - !reference [.mirror-branch-csr-rules, rules]
-  before_script:
-    - export GOWORK=off
 
 run-csr:
   rules: