From 49586191a05a9ea5bceb3384f4631b650bfffe42 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 09:50:50 -0700 Subject: [PATCH 01/20] APIGOV-25253 - work on CSR pipelines --- .csr-profile.json | 6 ++-- .gitlab-ci.yml | 77 +++++++++++------------------------------------ 2 files changed, 21 insertions(+), 62 deletions(-) diff --git a/.csr-profile.json b/.csr-profile.json index 7a4f6f7..a83a081 100644 --- a/.csr-profile.json +++ b/.csr-profile.json @@ -4,16 +4,16 @@ "security_guide": "https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/agent-security-api-manager/index.html", "requirements": { "dependency-check": false, - "fortify": false, + "fortify": true, "irius-risk": false, "npm-audit": false, "pentest": false, "retirejs": false, - "twistlock": false, + "twistlock": true, "zap": false, "yarn": false, "gosec": false, - "whitesource": false, + "whitesource": true, "appspider": false, "insightvm": false }, diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34db314..4a414f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,16 +1,8 @@ image: dockerhub.artifactory-phx.ecd.axway.int/library/docker:20.10.6 variables: - PACKAGE_NAME: discovery_agent - DOCKER_NAME: agents-webmethods - GIT_REPO_NAME: agents-webmethods - - # # Irius risk - # IRIUS_PROJECT: "amplify-apic_azure_discovery_agent" - # IRIUSRISK_COMPONENT_NAME: "azure_discovery-agent" - - # # Traceability Project ID - # TRACEABILITY_PROJECT_ID: 8659 + PROJECT: "agents-apigee" + CSR_SUPPRESSION_LIST: "/tmp/csr-suppressions/amplify-central/golang-agents-common.json" # # Fortify # FORTIFY_PROJECT: "10623" @@ -18,13 +10,9 @@ variables: # # Whitesource # WS_PROJECT_ID: "Azure-Discovery-Agent" + WS_CONFIG_FILE: "whitesource.config" - # # WeblivNext metadata that is specific to this agent - # WEBLIV_NEXT_TITLE: "Amplify Azure Discovery Agent" - # WEBLIV_NEXT_EXTRA_ELEMENT: "azure-da" - - # # flag to signal that a trigger traceability agent job is wanted (see agentjob.xml) - # TRIGGER_TRACE_AGENT_JOB: "true" + GIT_TAG_PREFIX: v # just to be sure we don't do vendoring GOFLAGS: "-mod=mod" @@ -33,13 +21,8 @@ stages: - test - sonar - build - - dependency - # - security-scans - # - security-review - - push-image - - release - - qa-test - - update-dep + - security-scans + - security-review ############################################################ # Section for included yaml files @@ -52,39 +35,15 @@ include: - "/gitlabci/variables.yml" - "/gitlabci/restrictions.yml" - "/gitlabci/jobs.yml" - - "/gitlabci/agentjobs.yml" - # - project: "scurity/gitlabci" - # ref: master - # file: - # - "/.gitlab-ci-prepcsr.yml" - # - "/.gitlab-ci-fortify.yml" - # - "/.gitlab-ci-iriusrisk.yml" - # - "/.gitlab-ci-whitesource.yml" - # - "/.gitlab-ci-twistlock.yml" - # - "/.gitlab-ci-csr.yml" - # - project: "apigov/beano_cicd" - # ref: master - # # this one MUST be after the scurity jobs in order for overrides to work correctly! - # file: - # - "/gitlabci/csrjobs.yml" - -hadolint: - extends: .only-never - -test: - extends: .only-never - -build-feature: - extends: .only-never - only: - refs: - - never - -push-feature: - extends: .only-never - - -sonar: - only: - refs: - - never + - project: "scurity/gitlabci" + ref: master + file: + - "/.gitlab-ci-fortify.yml" + - "/.gitlab-ci-whitesource.yml" + - "/.gitlab-ci-twistlock.yml" + - "/.gitlab-ci-csr.yml" + - project: "apigov/beano_cicd" + ref: master + # this one MUST be after the scurity jobs in order for overrides to work correctly! + file: + - "/gitlabci/csrjobs.yml" From 694a7b245edb30ca21b5aa0881d8866c0d647549 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 09:56:57 -0700 Subject: [PATCH 02/20] APIGOV-25253 - csr --- .gitlab-ci.yml | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a414f9..69614bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,3 +47,56 @@ include: # this one MUST be after the scurity jobs in order for overrides to work correctly! file: - "/gitlabci/csrjobs.yml" + +#################### +# CSR - overridden from csrjobs.yml to effectively not see these jobs ever. For some reason, probably multi-level +# extends and overrides, using only-never for these csr jobs doesn't work. Had to do it like this. +#################### +fetch-iriusrisk: + only: + refs: + - never + except: + refs: + - neverever + +fetch-iriusrisk:on-schedule: + only: + refs: + - never + except: + refs: + - neverever + +fetch-iriusrisk:on-schedule: + only: + refs: + - never + except: + refs: + - neverever + +twistlock: + only: + refs: + - never + except: + refs: + - neverever + dependencies: + +twistlock:on-schedule: + only: + refs: + - never + except: + refs: + - neverever + +twistlock-master: + only: + refs: + - never + except: + refs: + - neverever From 7e6119383bdc2958ead7a70946c65d1363ae0a85 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 09:58:36 -0700 Subject: [PATCH 03/20] APIGOV-25253 - csr --- .gitlab-ci.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69614bf..5771d6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,8 +12,6 @@ variables: # WS_PROJECT_ID: "Azure-Discovery-Agent" WS_CONFIG_FILE: "whitesource.config" - GIT_TAG_PREFIX: v - # just to be sure we don't do vendoring GOFLAGS: "-mod=mod" @@ -40,6 +38,7 @@ include: file: - "/.gitlab-ci-fortify.yml" - "/.gitlab-ci-whitesource.yml" + - "/.gitlab-ci-iriusrisk.yml" - "/.gitlab-ci-twistlock.yml" - "/.gitlab-ci-csr.yml" - project: "apigov/beano_cicd" @@ -68,14 +67,6 @@ fetch-iriusrisk:on-schedule: refs: - neverever -fetch-iriusrisk:on-schedule: - only: - refs: - - never - except: - refs: - - neverever - twistlock: only: refs: From 0a6583829b0bd1cdb8c47a1b98a753ccf60d3c50 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 10:06:20 -0700 Subject: [PATCH 04/20] APIGOV-25253 - csr --- .gitlab-ci.yml | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5771d6f..3e981c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,6 +47,80 @@ include: file: - "/gitlabci/csrjobs.yml" +# twistlock-discovery: +# extends: .twistlock +# before_script: +# - apk --no-cache update && apk add make +# - make docker-build-discovery +# - export IMAGE_NAME=mulesoft_discovery_agent:latest +# except: +# refs: +# - schedules +# - tags +# - main + +# twistlock-traceability: +# extends: .twistlock +# before_script: +# - apk --no-cache update && apk add make +# - make docker-build-traceability +# - export IMAGE_NAME=mulesoft_traceability_agent:latest +# except: +# refs: +# - schedules +# - tags +# - main + +# twistlock-discovery:on-schedule: +# extends: .twistlock +# dependencies: [] +# before_script: +# - apk --no-cache update && apk add git +# - *get-latest-tag +# - export IMAGE_NAME=ghcr.io/axway/mulesoft_discovery_agent:${GIT_TAG_PREFIX}${LATEST_TAG} +# - docker pull ${IMAGE_NAME} +# only: +# refs: +# - schedules + +# twistlock-traceability:on-schedule: +# extends: .twistlock +# dependencies: [] +# before_script: +# - apk --no-cache update && apk add git +# - *get-latest-tag +# - export IMAGE_NAME=ghcr.io/axway/mulesoft_traceability_agent:${GIT_TAG_PREFIX}${LATEST_TAG} +# - docker pull ${IMAGE_NAME} +# only: +# refs: +# - schedules + +whitesource:on-schedule: + extends: .whitesource + before_script: + - git config --global http.sslVerify false + - git config --global url."ssh://git@git.ecd.axway.org".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 +fetch-fortify: + only: + refs: + - /^APIGOV-.*$/ + +run-csr: + only: + refs: + - /^APIGOV-.*$/ + +whitesource: + only: + refs: + - /^APIGOV-.*$/ + #################### # CSR - overridden from csrjobs.yml to effectively not see these jobs ever. For some reason, probably multi-level # extends and overrides, using only-never for these csr jobs doesn't work. Had to do it like this. @@ -91,3 +165,9 @@ twistlock-master: except: refs: - neverever + +################### +# These overridden from jobs.xml to never run +################### +test: + extends: .only-never From 57c48b9a9e731ba66d12d859832c1e745a33c0fb Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 10:29:30 -0700 Subject: [PATCH 05/20] APIGOV-25253 - add --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e981c8..33c32a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,6 +47,13 @@ include: file: - "/gitlabci/csrjobs.yml" +.get-latest-tag: &get-latest-tag | + if [ $(git --version | grep -Eo '2.*') ]; then + export LATEST_TAG=$(git tag -l --sort="version:refname" | grep -Eo '[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,3}$' | tail -1) + else + export LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) + fi + # twistlock-discovery: # extends: .twistlock # before_script: From 713773d15aa62175f9c47e471dd30fa375c32ff4 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 10:52:15 -0700 Subject: [PATCH 06/20] APIGOV-25253 - fixes --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33c32a2..fc96ca1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,10 +6,10 @@ variables: # # Fortify # FORTIFY_PROJECT: "10623" - # FORTIFY_BUILD_ID: "azure_discovery_agent" + FORTIFY_BUILD_ID: "agents-webmethods" # # Whitesource - # WS_PROJECT_ID: "Azure-Discovery-Agent" + WS_PROJECT_ID: "agents-webmethods" WS_CONFIG_FILE: "whitesource.config" # just to be sure we don't do vendoring From 447c7f0ef4e558db7a80825a8b335e77b69609ea Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 14:44:27 -0700 Subject: [PATCH 07/20] APIGOV-25253 - fixes --- .github/workflows/build-discovery-agent.yml | 2 +- .gitlab-ci.yml | 46 ++++++++++----------- build/discovery.Dockerfile | 6 +-- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build-discovery-agent.yml b/.github/workflows/build-discovery-agent.yml index cce98b5..79d42a5 100644 --- a/.github/workflows/build-discovery-agent.yml +++ b/.github/workflows/build-discovery-agent.yml @@ -2,7 +2,7 @@ name: Build Webmethods Discovery Agent on: push: - branches: [main] + branches: [main, '*'] jobs: test: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc96ca1..736ec9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: dockerhub.artifactory-phx.ecd.axway.int/library/docker:20.10.6 variables: - PROJECT: "agents-apigee" + PROJECT: "agents-webmethods" CSR_SUPPRESSION_LIST: "/tmp/csr-suppressions/amplify-central/golang-agents-common.json" # # Fortify @@ -54,17 +54,17 @@ include: export LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) fi -# twistlock-discovery: -# extends: .twistlock -# before_script: -# - apk --no-cache update && apk add make -# - make docker-build-discovery -# - export IMAGE_NAME=mulesoft_discovery_agent:latest -# except: -# refs: -# - schedules -# - tags -# - main +twistlock-discovery: + extends: .twistlock + before_script: + - apk --no-cache update && apk add make + - make docker-build-discovery + - export IMAGE_NAME=mulesoft_discovery_agent:latest + except: + refs: + - schedules + - tags + - main # twistlock-traceability: # extends: .twistlock @@ -78,17 +78,17 @@ include: # - tags # - main -# twistlock-discovery:on-schedule: -# extends: .twistlock -# dependencies: [] -# before_script: -# - apk --no-cache update && apk add git -# - *get-latest-tag -# - export IMAGE_NAME=ghcr.io/axway/mulesoft_discovery_agent:${GIT_TAG_PREFIX}${LATEST_TAG} -# - docker pull ${IMAGE_NAME} -# only: -# refs: -# - schedules +twistlock-discovery:on-schedule: + extends: .twistlock + dependencies: [] + before_script: + - apk --no-cache update && apk add git + - *get-latest-tag + - export IMAGE_NAME=ghcr.io/axway/mulesoft_discovery_agent:${GIT_TAG_PREFIX}${LATEST_TAG} + - docker pull ${IMAGE_NAME} + only: + refs: + - schedules # twistlock-traceability:on-schedule: # extends: .twistlock diff --git a/build/discovery.Dockerfile b/build/discovery.Dockerfile index 7d93509..300db89 100644 --- a/build/discovery.Dockerfile +++ b/build/discovery.Dockerfile @@ -1,6 +1,6 @@ # Build image FROM docker.io/golang@sha256:46752c2ee3bd8388608e41362964c84f7a6dffe99d86faeddc82d917740c5968 as builder -ENV APP_HOME /go/src/github.com/Axway/agents-webmetods +ENV APP_HOME /go/src/github.com/Axway/agents-webmethods ENV APP_USER axway ENV AGENT=${APP_HOME}/cmd/discovery @@ -23,7 +23,7 @@ RUN export time=`date +%Y%m%d%H%M%S` && \ -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildVersion=${version}' \ -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildCommitSha=${commit_id}' \ -X 'github.com/Axway/agent-sdk/pkg/cmd.SDKBuildVersion=${sdk_version}' \ - -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentName=ApigeeDiscoveryAgent'" \ + -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentName=webMethodsDiscoveryAgent'" \ -a -o ${APP_HOME}/bin/webmethods_discovery_agent ${AGENT}/main.go # Create non-root user @@ -35,7 +35,7 @@ USER $APP_USER # Base image FROM docker.io/alpine@sha256:1304f174557314a7ed9eddb4eab12fed12cb0cd9809e4c28f29af86979a3c870 ENV APP_USER axway -ENV APP_HOME /go/src/github.com/Axway/agents-webmetods +ENV APP_HOME /go/src/github.com/Axway/agents-webmethods # Copy binary, user, config file and certs from previous build step From 887ccb0e7a09d4d49ee249eaa2c8383de344d7f3 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 14:57:48 -0700 Subject: [PATCH 08/20] APIGOV-25253 - fix error --- pkg/discovery/discover.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/discovery/discover.go b/pkg/discovery/discover.go index f183634..ee44e60 100644 --- a/pkg/discovery/discover.go +++ b/pkg/discovery/discover.go @@ -76,7 +76,7 @@ func (d *discovery) discoverAPIs() { } if !d.client.IsAllowedTags(apiResponse.Api.ApiDefinition.Tags) { - log.Info("API matched with filtered tags : %v , hence ignoring for discovery", err) + log.Infof("API matched with filtered tags : %v, hence ignoring for discovery", err) return } From 4eb8f652f53a5f371a00369fe2572b578010f797 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 15:21:59 -0700 Subject: [PATCH 09/20] APIGOV-25253 - fixes --- .gitlab-ci.yml | 10 ++++++---- Makefile | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 736ec9d..c8ec849 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,8 @@ variables: WS_PROJECT_ID: "agents-webmethods" WS_CONFIG_FILE: "whitesource.config" + GIT_TAG_PREFIX: v + # just to be sure we don't do vendoring GOFLAGS: "-mod=mod" @@ -59,7 +61,7 @@ twistlock-discovery: before_script: - apk --no-cache update && apk add make - make docker-build-discovery - - export IMAGE_NAME=mulesoft_discovery_agent:latest + - export IMAGE_NAME=webmethods_discovery_agent:latest except: refs: - schedules @@ -71,7 +73,7 @@ twistlock-discovery: # before_script: # - apk --no-cache update && apk add make # - make docker-build-traceability -# - export IMAGE_NAME=mulesoft_traceability_agent:latest +# - export IMAGE_NAME=webmethods_traceability_agent:latest # except: # refs: # - schedules @@ -84,7 +86,7 @@ twistlock-discovery:on-schedule: before_script: - apk --no-cache update && apk add git - *get-latest-tag - - export IMAGE_NAME=ghcr.io/axway/mulesoft_discovery_agent:${GIT_TAG_PREFIX}${LATEST_TAG} + - export IMAGE_NAME=ghcr.io/axway/webmethods_discovery_agent:${GIT_TAG_PREFIX}${LATEST_TAG} - docker pull ${IMAGE_NAME} only: refs: @@ -96,7 +98,7 @@ twistlock-discovery:on-schedule: # before_script: # - apk --no-cache update && apk add git # - *get-latest-tag -# - export IMAGE_NAME=ghcr.io/axway/mulesoft_traceability_agent:${GIT_TAG_PREFIX}${LATEST_TAG} +# - export IMAGE_NAME=ghcr.io/axway/webmethods_traceability_agent:${GIT_TAG_PREFIX}${LATEST_TAG} # - docker pull ${IMAGE_NAME} # only: # refs: diff --git a/Makefile b/Makefile index c4f2e6d..b718365 100644 --- a/Makefile +++ b/Makefile @@ -87,10 +87,10 @@ test: mkdir -p coverage @go test -race -short -count=1 -coverprofile=coverage/coverage.cov ${GO_PKG_LIST} -docker-build-disc: +docker-build-discovery: @docker build -t webmethods_discovery_agent:latest -f ${WORKSPACE}/build/discovery.Dockerfile . @echo "Docker build complete" -docker-build-trace: +docker-build-traceability: @docker build -t webmethods_traceability_agent:latest -f ${WORKSPACE}/build/traceability.Dockerfile . @echo "Docker build complete" From be4fa1bc4995045c5cd7b6aec7cc852834c26529 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 15:47:56 -0700 Subject: [PATCH 10/20] APIGOV-25253 - update docker base image --- build/discovery.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/discovery.Dockerfile b/build/discovery.Dockerfile index 300db89..dfec20c 100644 --- a/build/discovery.Dockerfile +++ b/build/discovery.Dockerfile @@ -1,5 +1,6 @@ # Build image -FROM docker.io/golang@sha256:46752c2ee3bd8388608e41362964c84f7a6dffe99d86faeddc82d917740c5968 as builder +# golang:1.19.6-alpine3.17 linux/amd64 +FROM dockerhub.artifactory-phx.ecd.axway.int/golang@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa ENV APP_HOME /go/src/github.com/Axway/agents-webmethods ENV APP_USER axway ENV AGENT=${APP_HOME}/cmd/discovery From 3f08f7bffbb94c6bb399de29bb55a5f9fdbd7df9 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 16:10:33 -0700 Subject: [PATCH 11/20] APIGOV-25253 - update libs --- build/discovery.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/discovery.Dockerfile b/build/discovery.Dockerfile index dfec20c..fba11b9 100644 --- a/build/discovery.Dockerfile +++ b/build/discovery.Dockerfile @@ -1,6 +1,6 @@ # Build image # golang:1.19.6-alpine3.17 linux/amd64 -FROM dockerhub.artifactory-phx.ecd.axway.int/golang@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa +FROM dockerhub.artifactory-phx.ecd.axway.int/golang@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa as builder ENV APP_HOME /go/src/github.com/Axway/agents-webmethods ENV APP_USER axway ENV AGENT=${APP_HOME}/cmd/discovery @@ -48,7 +48,7 @@ COPY --from=builder ${APP_HOME}/bin/webmethods_discovery_agent /webmethods_disco RUN mkdir /keys && \ chown -R axway /keys && \ - apk --no-cache add openssl libssl1.1 libcrypto1.1 musl musl-utils libc6-compat busybox curl && \ + apk --no-cache add openssl libssl libcrypto musl musl-utils libc6-compat busybox curl && \ find / -perm /6000 -type f -exec chmod a-s {} \; || true From 730e881625162c1f7a6458f89928831ffcbae664 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 16:37:14 -0700 Subject: [PATCH 12/20] APIGOV-25253 - fix --- build/discovery.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/discovery.Dockerfile b/build/discovery.Dockerfile index fba11b9..b22f05c 100644 --- a/build/discovery.Dockerfile +++ b/build/discovery.Dockerfile @@ -1,6 +1,6 @@ # Build image # golang:1.19.6-alpine3.17 linux/amd64 -FROM dockerhub.artifactory-phx.ecd.axway.int/golang@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa as builder +FROM docker.io/golang@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa as builder ENV APP_HOME /go/src/github.com/Axway/agents-webmethods ENV APP_USER axway ENV AGENT=${APP_HOME}/cmd/discovery From dfe3c49be67c88e4d478b9d027e7befd86023865 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 18 Apr 2023 16:43:46 -0700 Subject: [PATCH 13/20] APIGOV-25253 - update base image --- build/discovery.Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/discovery.Dockerfile b/build/discovery.Dockerfile index b22f05c..7dabd47 100644 --- a/build/discovery.Dockerfile +++ b/build/discovery.Dockerfile @@ -1,6 +1,7 @@ # Build image -# golang:1.19.6-alpine3.17 linux/amd64 -FROM docker.io/golang@sha256:f2e0acaf7c628cd819b73541d7c1ea8f888d51edb0a58935a3c46a084fa953fa as builder +# golang:1.19.8-alpine3.17 linux/amd64 +FROM docker.io/golang@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f as builder + ENV APP_HOME /go/src/github.com/Axway/agents-webmethods ENV APP_USER axway ENV AGENT=${APP_HOME}/cmd/discovery From 0d3f18d7aeebc61d8dd65032ee2c20f60761bd49 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 25 Apr 2023 12:39:04 -0700 Subject: [PATCH 14/20] APIGOV-25253 - add fortify project ID --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8ec849..9db39ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,11 +4,11 @@ variables: PROJECT: "agents-webmethods" CSR_SUPPRESSION_LIST: "/tmp/csr-suppressions/amplify-central/golang-agents-common.json" - # # Fortify - # FORTIFY_PROJECT: "10623" + # Fortify + FORTIFY_PROJECT: "10808" FORTIFY_BUILD_ID: "agents-webmethods" - # # Whitesource + # Whitesource WS_PROJECT_ID: "agents-webmethods" WS_CONFIG_FILE: "whitesource.config" From 11290f107e5ee5cb3cbcf43ca4ab73a5d8310361 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 25 Apr 2023 13:24:19 -0700 Subject: [PATCH 15/20] APIGOV-25253 - update SDK version --- go.mod | 15 +++++++-------- go.sum | 31 +++++++++++++++---------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index a9868ab..6569083 100644 --- a/go.mod +++ b/go.mod @@ -13,12 +13,11 @@ replace ( ) require ( - github.com/Axway/agent-sdk v1.1.47 + github.com/Axway/agent-sdk v1.1.51 github.com/elastic/beats/v7 v7.17.7 github.com/hpcloud/tail v1.0.0 github.com/sirupsen/logrus v1.9.0 github.com/stretchr/testify v1.8.0 - gotest.tools v2.2.0+incompatible ) require ( @@ -149,14 +148,14 @@ require ( go.uber.org/zap v1.21.0 // indirect golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect - golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.7.0 // indirect + golang.org/x/mod v0.8.0 // indirect + golang.org/x/net v0.8.0 // indirect golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/term v0.6.0 // indirect + golang.org/x/text v0.8.0 // indirect golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect - golang.org/x/tools v0.1.12 // indirect + golang.org/x/tools v0.6.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220714211235-042d03aeabc9 // indirect google.golang.org/grpc v1.48.0 // indirect diff --git a/go.sum b/go.sum index 5249886..c785b20 100644 --- a/go.sum +++ b/go.sum @@ -36,8 +36,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Axway/agent-sdk v1.1.47 h1:YdHphm90S0FTTw7nulbT17zH7STlr9LCOGoIlJtev0Y= -github.com/Axway/agent-sdk v1.1.47/go.mod h1:/8IUBh07SVt+VAoOTkoYE6psQ2y0FQ5LW82bdEo7ZFw= +github.com/Axway/agent-sdk v1.1.51 h1:sEowgaJwqprkH+nljK6bdDL6+O2C731TqJ5dpN+oUiU= +github.com/Axway/agent-sdk v1.1.51/go.mod h1:qZLeztsb8aC0xA5u0zL/MElAnuBKRMSP84WQFRp/XEM= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= @@ -594,8 +594,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -637,8 +637,8 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -661,7 +661,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -719,14 +719,14 @@ golang.org/x/sys v0.0.0-20211102192858-4dd72447c267/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -735,8 +735,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -798,8 +798,8 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -947,7 +947,6 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 4d5107e296ade9d3e0b1718ddcbae8c2130ea1fb Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 25 Apr 2023 13:41:51 -0700 Subject: [PATCH 16/20] APIGOV-25253 - set beats version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6569083..6e46ea3 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ replace ( require ( github.com/Axway/agent-sdk v1.1.51 - github.com/elastic/beats/v7 v7.17.7 + github.com/elastic/beats/v7 v7.17.5 github.com/hpcloud/tail v1.0.0 github.com/sirupsen/logrus v1.9.0 github.com/stretchr/testify v1.8.0 diff --git a/go.sum b/go.sum index c785b20..6307447 100644 --- a/go.sum +++ b/go.sum @@ -112,8 +112,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/elastic/beats/v7 v7.17.7 h1:I1StNgMXbcPr3GXR1jJXLwIUjVrBC5OMhiZb2nw3m1s= -github.com/elastic/beats/v7 v7.17.7/go.mod h1:oivE+WJI3AswUSTe7nb1Y5K1oMHCh2r5kVo1VBaUV3E= +github.com/elastic/beats/v7 v7.17.5 h1:/cvFiUuXnIHzBnb7RzCfn06nydYbJyD9VIPv2N4UWG4= +github.com/elastic/beats/v7 v7.17.5/go.mod h1:nFsbsraCRGlck/aOwtfEJFKEyVBiDqxGvZ3ZES6sMn4= github.com/elastic/ecs v1.12.0 h1:u6WZ2AWtxv5vHvTQ4EuVZdWZ51mKHQ2UIltRePcta5U= github.com/elastic/ecs v1.12.0/go.mod h1:pgiLbQsijLOJvFR8OTILLu0Ni/R/foUNg0L+T6mU9b4= github.com/elastic/elastic-agent-client/v7 v7.0.0-20220607160924-1a71765a8bbe h1:knHO5fYAT3+sLf64NxcOxdjGysPxsSMkQGB27vMS8TE= From 6d8c008d70e73c8ef794e8c5d60bc071ba423b39 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 25 Apr 2023 14:25:02 -0700 Subject: [PATCH 17/20] APIGOV-25253 - update go.mod --- go.mod | 9 +++++---- go.sum | 14 +++++++++++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 6e46ea3..f72b1f0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.ecd.axway.org/apigov/agents-webmethods +module github.com/Axway/agents-webmethods go 1.18 @@ -13,6 +13,7 @@ replace ( ) require ( + git.ecd.axway.org/apigov/agents-webmethods v0.0.0-20230425204558-c2f94237ca20 github.com/Axway/agent-sdk v1.1.51 github.com/elastic/beats/v7 v7.17.5 github.com/hpcloud/tail v1.0.0 @@ -73,7 +74,7 @@ require ( github.com/google/go-cmp v0.5.8 // indirect github.com/google/gofuzz v1.1.0 // indirect github.com/google/uuid v1.3.0 // indirect - github.com/googleapis/gnostic v0.4.1 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/h2non/filetype v1.1.1 // indirect @@ -176,8 +177,8 @@ require ( k8s.io/api v0.21.1 // indirect k8s.io/apimachinery v0.22.7 // indirect k8s.io/client-go v0.21.1 // indirect - k8s.io/klog/v2 v2.8.0 // indirect + k8s.io/klog/v2 v2.9.0 // indirect k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect sigs.k8s.io/yaml v1.2.0 // indirect ) diff --git a/go.sum b/go.sum index 6307447..859d496 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +git.ecd.axway.org/apigov/agents-webmethods v0.0.0-20230425204558-c2f94237ca20 h1:t2e+Kui9fA71sYyNFDZGd5YvCj44p1EFPCWSrGQpWkY= +git.ecd.axway.org/apigov/agents-webmethods v0.0.0-20230425204558-c2f94237ca20/go.mod h1:wR7a8jlP+2mGXZ5tDnXtGohddmes3bThswmkgPm3YZk= github.com/Axway/agent-sdk v1.1.51 h1:sEowgaJwqprkH+nljK6bdDL6+O2C731TqJ5dpN+oUiU= github.com/Axway/agent-sdk v1.1.51/go.mod h1:qZLeztsb8aC0xA5u0zL/MElAnuBKRMSP84WQFRp/XEM= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= @@ -279,8 +281,9 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gnostic v0.4.1 h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= +github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= +github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 h1:f0n1xnMSmBLzVfsMMvriDyA75NB/oBgILX2GcHXIQzY= github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA= @@ -465,6 +468,7 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= @@ -863,6 +867,7 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -943,6 +948,7 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -965,8 +971,9 @@ k8s.io/client-go v0.21.1 h1:bhblWYLZKUu+pm50plvQF8WpY6TXdRRtcS/K9WauOj4= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= +k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= +k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= @@ -975,7 +982,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.0 h1:C4r9BgJ98vrKnnVCjwCSXcWjWe0NKcUQkmzDXZXGwH8= sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= From 971b5516efdecdedaa34e5415a1c84dfd1dee885 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 25 Apr 2023 14:36:56 -0700 Subject: [PATCH 18/20] APIGOV-25253 - fix paths to match github, not gitlab --- .csr-profile.json | 4 +- README_discovery.md | 2 +- README_traceability.md | 2 +- cmd/discovery/main.go | 2 +- cmd/traceability/main.go | 2 +- coverage/coverage.cov | 111 +++++++++++++++++++++++++++++ go.mod | 1 - go.sum | 2 - pkg/cmd/discovery/root.go | 10 +-- pkg/cmd/traceability/root.go | 4 +- pkg/discovery/agent.go | 4 +- pkg/discovery/discover.go | 4 +- pkg/discovery/publish.go | 2 +- pkg/discovery/servicehandler.go | 6 +- pkg/subscription/provision.go | 4 +- pkg/traceability/agent.go | 2 +- pkg/traceability/eventprocessor.go | 2 +- pkg/webmethods/client.go | 2 +- pkg/webmethods/client_test.go | 2 +- 19 files changed, 138 insertions(+), 30 deletions(-) create mode 100644 coverage/coverage.cov diff --git a/.csr-profile.json b/.csr-profile.json index a83a081..cbeb48d 100644 --- a/.csr-profile.json +++ b/.csr-profile.json @@ -1,7 +1,7 @@ { "project": "V7 Discovery Agent", - "repo_url": "https://git.ecd.axway.org/apigov/v7_discovery_agent", - "security_guide": "https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/agent-security-api-manager/index.html", + "repo_url": "https://github.com/Axway/agents-webmethods", + "security_guide": "https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/agent-security-api-manager/index.html", "requirements": { "dependency-check": false, "fortify": true, diff --git a/README_discovery.md b/README_discovery.md index 35a5794..4e044b8 100644 --- a/README_discovery.md +++ b/README_discovery.md @@ -2,7 +2,7 @@ ## Prerequisites -Install the agent and provision Amplify Central access as described in [https://git.ecd.axway.org/apigov/agents-webmethods/blob/main/README.md](https://git.ecd.axway.org/apigov/agents-webmethods/blob/main/README.md). +Install the agent and provision Amplify Central access as described in [https://github.com/Axway/agents-webmethods/blob/main/README.md](https://github.com/Axway/agents-webmethods/blob/main/README.md). - Amplify organization id: the organization identifier. Refer to Platform home > Organization - Amplify Central environment name: the name of the environment the agent will report APIs to. diff --git a/README_traceability.md b/README_traceability.md index 5088018..21cb0e6 100644 --- a/README_traceability.md +++ b/README_traceability.md @@ -2,7 +2,7 @@ ## Prerequisites -Install the agent and provision Amplify Central access as described in [https://git.ecd.axway.org/apigov/agents-webmethods/blob/main/README.md](https://git.ecd.axway.org/apigov/agents-webmethods/blob/main/README.md). +Install the agent and provision Amplify Central access as described in [https://github.com/Axway/agents-webmethods/blob/main/README.md](https://github.com/Axway/agents-webmethods/blob/main/README.md). - Amplify organization id: the organization identifier. Refer to Platform home > Organization - Amplify Central environment name: the name of the environment the agent will report APIs to. diff --git a/cmd/discovery/main.go b/cmd/discovery/main.go index d2bf2cf..0d82982 100644 --- a/cmd/discovery/main.go +++ b/cmd/discovery/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/cmd/discovery" + "github.com/Axway/agents-webmethods/pkg/cmd/discovery" ) func main() { diff --git a/cmd/traceability/main.go b/cmd/traceability/main.go index 78baaad..7a58f41 100644 --- a/cmd/traceability/main.go +++ b/cmd/traceability/main.go @@ -7,7 +7,7 @@ import ( // Required Import to setup factory for traceability transport _ "github.com/Axway/agent-sdk/pkg/traceability" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/cmd/traceability" + "github.com/Axway/agents-webmethods/pkg/cmd/traceability" ) func main() { diff --git a/coverage/coverage.cov b/coverage/coverage.cov new file mode 100644 index 0000000..138696b --- /dev/null +++ b/coverage/coverage.cov @@ -0,0 +1,111 @@ +mode: atomic +github.com/Axway/agents-webmethods/pkg/webmethods/mocks.go:13.75,15.2 1 16 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:62.110,68.2 5 20 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:70.89,75.53 5 20 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:83.2,83.12 1 20 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:75.53,78.17 2 9 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:81.3,81.29 1 9 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:78.17,80.4 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:86.72,98.16 5 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:105.2,105.36 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:112.2,112.15 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:98.16,103.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:105.36,110.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:117.65,134.16 6 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:137.2,139.16 3 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:142.2,142.37 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:134.16,136.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:139.16,141.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:146.74,160.16 6 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:164.2,165.16 2 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:169.2,169.40 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:160.16,162.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:165.16,167.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:172.58,173.30 1 4 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:180.2,180.13 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:173.30,175.30 2 4 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:178.3,178.45 1 4 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:175.30,177.4 1 20 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:184.65,200.16 6 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:204.2,204.27 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:200.16,202.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:208.75,221.16 5 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:224.2,224.27 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:221.16,223.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:227.109,242.16 12 2 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:245.2,252.16 3 2 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:256.2,257.16 2 2 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:260.2,260.33 1 2 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:242.16,244.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:252.16,254.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:257.16,259.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:263.94,276.16 6 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:280.2,281.16 2 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:284.2,284.33 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:276.16,278.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:281.16,283.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:287.93,295.16 5 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:298.2,306.16 3 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:310.2,311.33 2 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:295.16,297.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:306.16,308.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:314.93,322.16 5 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:325.2,333.16 3 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:337.2,338.33 2 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:322.16,324.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:333.16,335.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:341.95,350.16 5 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:353.2,361.16 3 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:365.2,365.26 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:370.2,370.65 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:350.16,352.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:361.16,363.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:365.26,368.3 2 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:373.85,386.16 6 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:390.2,391.16 2 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:394.2,394.30 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:386.16,388.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:391.16,393.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:397.132,404.16 4 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:407.2,415.16 3 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:418.2,418.26 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:421.2,421.12 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:404.16,406.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:415.16,417.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:418.26,420.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:424.79,439.16 6 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:442.2,442.26 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:445.2,445.12 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:439.16,441.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:442.26,444.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:448.67,461.16 5 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:464.2,464.26 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:467.2,467.12 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:461.16,463.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:464.26,466.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:470.98,485.16 6 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:489.2,490.16 2 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:493.2,493.30 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:485.16,487.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:490.16,492.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:496.73,509.16 5 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:512.2,512.26 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:515.2,515.12 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:509.16,511.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:512.26,514.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:518.85,533.16 6 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:536.2,536.26 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:539.2,539.12 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:533.16,535.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:536.26,538.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:542.92,560.16 6 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:563.2,563.26 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:566.2,566.12 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:560.16,562.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:563.26,565.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:569.70,603.16 7 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:607.2,608.16 2 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:611.2,611.26 1 1 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:603.16,605.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:608.16,610.3 1 0 +github.com/Axway/agents-webmethods/pkg/webmethods/client.go:614.52,617.2 2 16 diff --git a/go.mod b/go.mod index f72b1f0..b36e8ea 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,6 @@ replace ( ) require ( - git.ecd.axway.org/apigov/agents-webmethods v0.0.0-20230425204558-c2f94237ca20 github.com/Axway/agent-sdk v1.1.51 github.com/elastic/beats/v7 v7.17.5 github.com/hpcloud/tail v1.0.0 diff --git a/go.sum b/go.sum index 859d496..9cab0bf 100644 --- a/go.sum +++ b/go.sum @@ -36,8 +36,6 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -git.ecd.axway.org/apigov/agents-webmethods v0.0.0-20230425204558-c2f94237ca20 h1:t2e+Kui9fA71sYyNFDZGd5YvCj44p1EFPCWSrGQpWkY= -git.ecd.axway.org/apigov/agents-webmethods v0.0.0-20230425204558-c2f94237ca20/go.mod h1:wR7a8jlP+2mGXZ5tDnXtGohddmes3bThswmkgPm3YZk= github.com/Axway/agent-sdk v1.1.51 h1:sEowgaJwqprkH+nljK6bdDL6+O2C731TqJ5dpN+oUiU= github.com/Axway/agent-sdk v1.1.51/go.mod h1:qZLeztsb8aC0xA5u0zL/MElAnuBKRMSP84WQFRp/XEM= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= diff --git a/pkg/cmd/discovery/root.go b/pkg/cmd/discovery/root.go index fb7d126..486282e 100644 --- a/pkg/cmd/discovery/root.go +++ b/pkg/cmd/discovery/root.go @@ -5,18 +5,18 @@ import ( "github.com/Axway/agent-sdk/pkg/apic/provisioning" "github.com/sirupsen/logrus" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/subscription" - subs "git.ecd.axway.org/apigov/agents-webmethods/pkg/subscription" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/webmethods" coreagent "github.com/Axway/agent-sdk/pkg/agent" coreapi "github.com/Axway/agent-sdk/pkg/api" corecmd "github.com/Axway/agent-sdk/pkg/cmd" + "github.com/Axway/agents-webmethods/pkg/subscription" + subs "github.com/Axway/agents-webmethods/pkg/subscription" + "github.com/Axway/agents-webmethods/pkg/webmethods" "github.com/Axway/agent-sdk/pkg/cmd/service" corecfg "github.com/Axway/agent-sdk/pkg/config" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/config" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/discovery" + "github.com/Axway/agents-webmethods/pkg/config" + "github.com/Axway/agents-webmethods/pkg/discovery" ) // RootCmd - Agent root command diff --git a/pkg/cmd/traceability/root.go b/pkg/cmd/traceability/root.go index 4335096..08df1ce 100644 --- a/pkg/cmd/traceability/root.go +++ b/pkg/cmd/traceability/root.go @@ -1,11 +1,11 @@ package traceability import ( - "git.ecd.axway.org/apigov/agents-webmethods/pkg/config" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/traceability" corecmd "github.com/Axway/agent-sdk/pkg/cmd" "github.com/Axway/agent-sdk/pkg/cmd/service" corecfg "github.com/Axway/agent-sdk/pkg/config" + "github.com/Axway/agents-webmethods/pkg/config" + "github.com/Axway/agents-webmethods/pkg/traceability" libcmd "github.com/elastic/beats/v7/libbeat/cmd" "github.com/elastic/beats/v7/libbeat/cmd/instance" diff --git a/pkg/discovery/agent.go b/pkg/discovery/agent.go index 63ebe2c..2b3e79b 100644 --- a/pkg/discovery/agent.go +++ b/pkg/discovery/agent.go @@ -5,10 +5,10 @@ import ( "os/signal" "syscall" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/config" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/webmethods" coreAgent "github.com/Axway/agent-sdk/pkg/agent" "github.com/Axway/agent-sdk/pkg/cache" + "github.com/Axway/agents-webmethods/pkg/config" + "github.com/Axway/agents-webmethods/pkg/webmethods" ) type Repeater interface { diff --git a/pkg/discovery/discover.go b/pkg/discovery/discover.go index ee44e60..4d6852d 100644 --- a/pkg/discovery/discover.go +++ b/pkg/discovery/discover.go @@ -7,8 +7,8 @@ import ( "github.com/Axway/agent-sdk/pkg/cache" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/config" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/webmethods" + "github.com/Axway/agents-webmethods/pkg/config" + "github.com/Axway/agents-webmethods/pkg/webmethods" "github.com/sirupsen/logrus" diff --git a/pkg/discovery/publish.go b/pkg/discovery/publish.go index f6226fe..46a037e 100644 --- a/pkg/discovery/publish.go +++ b/pkg/discovery/publish.go @@ -1,10 +1,10 @@ package discovery import ( - "git.ecd.axway.org/apigov/agents-webmethods/pkg/config" coreAgent "github.com/Axway/agent-sdk/pkg/agent" "github.com/Axway/agent-sdk/pkg/apic" "github.com/Axway/agent-sdk/pkg/util" + "github.com/Axway/agents-webmethods/pkg/config" "github.com/sirupsen/logrus" ) diff --git a/pkg/discovery/servicehandler.go b/pkg/discovery/servicehandler.go index 2895e9a..cb6d41f 100644 --- a/pkg/discovery/servicehandler.go +++ b/pkg/discovery/servicehandler.go @@ -4,15 +4,15 @@ import ( "crypto/sha256" "fmt" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/common" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/webmethods" "github.com/Axway/agent-sdk/pkg/apic/provisioning" "github.com/Axway/agent-sdk/pkg/cache" + "github.com/Axway/agents-webmethods/pkg/common" + "github.com/Axway/agents-webmethods/pkg/webmethods" "github.com/sirupsen/logrus" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/config" "github.com/Axway/agent-sdk/pkg/apic" + "github.com/Axway/agents-webmethods/pkg/config" ) const ( diff --git a/pkg/subscription/provision.go b/pkg/subscription/provision.go index cb7e4d9..479658f 100644 --- a/pkg/subscription/provision.go +++ b/pkg/subscription/provision.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/common" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/webmethods" prov "github.com/Axway/agent-sdk/pkg/apic/provisioning" "github.com/Axway/agent-sdk/pkg/util" "github.com/Axway/agent-sdk/pkg/util/log" + "github.com/Axway/agents-webmethods/pkg/common" + "github.com/Axway/agents-webmethods/pkg/webmethods" "github.com/sirupsen/logrus" ) diff --git a/pkg/traceability/agent.go b/pkg/traceability/agent.go index 2a8e8ab..52325e0 100644 --- a/pkg/traceability/agent.go +++ b/pkg/traceability/agent.go @@ -5,11 +5,11 @@ import ( "os/signal" "syscall" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/config" coreagent "github.com/Axway/agent-sdk/pkg/agent" "github.com/Axway/agent-sdk/pkg/transaction" agenterrors "github.com/Axway/agent-sdk/pkg/util/errors" hc "github.com/Axway/agent-sdk/pkg/util/healthcheck" + "github.com/Axway/agents-webmethods/pkg/config" "github.com/elastic/beats/v7/libbeat/beat" "github.com/elastic/beats/v7/libbeat/common" ) diff --git a/pkg/traceability/eventprocessor.go b/pkg/traceability/eventprocessor.go index dd9601d..0b5d869 100644 --- a/pkg/traceability/eventprocessor.go +++ b/pkg/traceability/eventprocessor.go @@ -7,7 +7,7 @@ import ( "github.com/Axway/agent-sdk/pkg/transaction" "github.com/Axway/agent-sdk/pkg/util/log" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/config" + "github.com/Axway/agents-webmethods/pkg/config" "github.com/elastic/beats/v7/libbeat/beat" ) diff --git a/pkg/webmethods/client.go b/pkg/webmethods/client.go index 7d9fa5f..618b5e2 100644 --- a/pkg/webmethods/client.go +++ b/pkg/webmethods/client.go @@ -12,7 +12,7 @@ import ( agenterrors "github.com/Axway/agent-sdk/pkg/util/errors" hc "github.com/Axway/agent-sdk/pkg/util/healthcheck" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/config" + "github.com/Axway/agents-webmethods/pkg/config" ) const HealthCheckEndpoint = "health" diff --git a/pkg/webmethods/client_test.go b/pkg/webmethods/client_test.go index 6b81c9a..723781b 100644 --- a/pkg/webmethods/client_test.go +++ b/pkg/webmethods/client_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "git.ecd.axway.org/apigov/agents-webmethods/pkg/config" coreapi "github.com/Axway/agent-sdk/pkg/api" + "github.com/Axway/agents-webmethods/pkg/config" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) From 7f7597f623fb5e28ff47fd1718bbfbb53f6c3520 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Thu, 27 Apr 2023 13:04:52 -0700 Subject: [PATCH 19/20] APIGOV-00001 - update golang and alpine versions --- build/discovery.Dockerfile | 7 +++---- build/traceability.Dockerfile | 8 +++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build/discovery.Dockerfile b/build/discovery.Dockerfile index 7dabd47..436cc6d 100644 --- a/build/discovery.Dockerfile +++ b/build/discovery.Dockerfile @@ -34,14 +34,13 @@ RUN chown -R $APP_USER:$APP_USER ${APP_HOME}/bin/webmethods_discovery_agent USER $APP_USER -# Base image -FROM docker.io/alpine@sha256:1304f174557314a7ed9eddb4eab12fed12cb0cd9809e4c28f29af86979a3c870 +# alpine 3.17.3 +FROM docker.io/alpine@sha256:b6ca290b6b4cdcca5b3db3ffa338ee0285c11744b4a6abaa9627746ee3291d8d + ENV APP_USER axway ENV APP_HOME /go/src/github.com/Axway/agents-webmethods # Copy binary, user, config file and certs from previous build step - - COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=builder /etc/passwd /etc/passwd COPY --from=builder $APP_HOME/build/webmethods_discovery_agent.yml /webmethods_discovery_agent.yml diff --git a/build/traceability.Dockerfile b/build/traceability.Dockerfile index aea518e..c575106 100644 --- a/build/traceability.Dockerfile +++ b/build/traceability.Dockerfile @@ -1,5 +1,7 @@ # Build image -FROM golang:1.19.2 as builder +# golang:1.19.8-alpine3.17 linux/amd64 +FROM docker.io/golang@sha256:841c160ed35923d96c95c52403c4e6db5decd9cbce034aa851e412ade5d4b74f as builder + ENV APP_HOME /build ENV APP_USER axway @@ -26,8 +28,8 @@ RUN mkdir /app/data && \ RUN chgrp -R 0 /app && chmod -R g=u /app && chown -R $APP_USER /app -# Base image -FROM scratch +# alpine 3.17.3 +FROM docker.io/alpine@sha256:b6ca290b6b4cdcca5b3db3ffa338ee0285c11744b4a6abaa9627746ee3291d8d ENV APP_HOME /build ENV APP_USER axway From deb31eba8c2e068025d6f6c90444a84bdfdc4904 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Fri, 28 Apr 2023 07:32:24 -0700 Subject: [PATCH 20/20] APIGOV-00002 - fix project name for csr --- .csr-profile.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.csr-profile.json b/.csr-profile.json index cbeb48d..9fe6103 100644 --- a/.csr-profile.json +++ b/.csr-profile.json @@ -1,5 +1,5 @@ { - "project": "V7 Discovery Agent", + "project": "Webmethods Agents", "repo_url": "https://github.com/Axway/agents-webmethods", "security_guide": "https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/agent-security-api-manager/index.html", "requirements": {