Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apigov 00000 #148

Merged
merged 6 commits into from
Sep 21, 2023
Merged

Apigov 00000 #148

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6639830
APIGOV-00000 - update to sdk v1.1.62
dfeldick Sep 8, 2023
9c7bc22
APIGOV-00000 - update to sdk v1.1.62
dfeldick Sep 8, 2023
05da09b
APIGOV-00000 - update to sdk v1.1.62
dfeldick Sep 8, 2023
b170232
APIGOV-00000 - sdk v1.1.63
dfeldick Sep 21, 2023
8ee7ca1
APIGOV-00000 - update to go 1.21.1 and alpine 3.18.3
dfeldick Sep 21, 2023
c5f0d44
Merge branch 'main' into APIGOV-00000
dfeldick Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

// replace github.com/Axway/agent-sdk => /home/ubuntu/go/src/github.com/Axway/agent-sdk

require github.com/Axway/agent-sdk v1.1.61
require github.com/Axway/agent-sdk v1.1.63

require (
github.com/armon/go-radix v1.0.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions client/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.61 h1:tanMYUO1ylzqG2Nk9V3fJn+d4vhkauexITcA97raFJE=
github.com/Axway/agent-sdk v1.1.61/go.mod h1:IjZ/VyF0fQezmrxSRI7l9jEuOGYl8Hc/XkotLuIYcnw=
github.com/Axway/agent-sdk v1.1.63 h1:4ozpjwU8pqgyBEJ40jzA5rpvKpV69pQ9jMgeVK3ywdk=
github.com/Axway/agent-sdk v1.1.63/go.mod h1:IjZ/VyF0fQezmrxSRI7l9jEuOGYl8Hc/XkotLuIYcnw=
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
Expand Down
8 changes: 4 additions & 4 deletions discovery/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Build image
# golang:1.21.0-alpine3.18 linux/amd64
FROM docker.io/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c AS builder
# golang:1.21.1-alpine3.18 linux/amd64
FROM docker.io/golang@sha256:0c860c7ceba62231d0f99fb92e9d7c1577f26fea794a12c75756a8f64b146e45 AS builder

ENV GOFLAGS "-mod=mod"
ENV GOWORK "off"
Expand Down Expand Up @@ -40,8 +40,8 @@ RUN addgroup -g 2500 axway && adduser -u 2500 -D -G axway axway
RUN chown -R axway:axway /go/src/github.com/Axway/agents-apigee/discovery/bin/apigee_discovery_agent
USER axway

# alpine 3.18.2
FROM docker.io/alpine@sha256:25fad2a32ad1f6f510e528448ae1ec69a28ef81916a004d3629874104f8a7f70
# alpine 3.18.3
FROM docker.io/alpine@sha256:c5c5fda71656f28e49ac9c5416b3643eaa6a108a8093151d6d1afc9463be8e33

COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=builder /etc/passwd /etc/passwd
Expand Down
2 changes: 1 addition & 1 deletion discovery/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.18
// replace github.com/Axway/agent-sdk => /home/ubuntu/go/src/github.com/Axway/agent-sdk

require (
github.com/Axway/agent-sdk v1.1.61
github.com/Axway/agent-sdk v1.1.63
github.com/Axway/agents-apigee/client v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.8.4
)
Expand Down
4 changes: 2 additions & 2 deletions discovery/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.61 h1:tanMYUO1ylzqG2Nk9V3fJn+d4vhkauexITcA97raFJE=
github.com/Axway/agent-sdk v1.1.61/go.mod h1:IjZ/VyF0fQezmrxSRI7l9jEuOGYl8Hc/XkotLuIYcnw=
github.com/Axway/agent-sdk v1.1.63 h1:4ozpjwU8pqgyBEJ40jzA5rpvKpV69pQ9jMgeVK3ywdk=
github.com/Axway/agent-sdk v1.1.63/go.mod h1:IjZ/VyF0fQezmrxSRI7l9jEuOGYl8Hc/XkotLuIYcnw=
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
Expand Down
8 changes: 4 additions & 4 deletions traceability/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Build image
# golang:1.21.0-alpine3.18 linux/amd64
FROM docker.io/golang@sha256:dd8888bb7f1b0b05e1e625aa29483f50f38a9b64073a4db00b04076cec52b71c AS builder
# golang:1.21.1-alpine3.18 linux/amd64
FROM docker.io/golang@sha256:0c860c7ceba62231d0f99fb92e9d7c1577f26fea794a12c75756a8f64b146e45 AS builder

ENV GOFLAGS "-mod=mod"
ENV GOWORK "off"
Expand Down Expand Up @@ -40,8 +40,8 @@ RUN addgroup -g 2500 axway && adduser -u 2500 -D -G axway axway
RUN chown -R axway:axway /go/src/github.com/Axway/agents-apigee/traceability/bin/apigee_traceability_agent
USER axway

# alpine 3.18.2
FROM docker.io/alpine@sha256:25fad2a32ad1f6f510e528448ae1ec69a28ef81916a004d3629874104f8a7f70
# alpine 3.18.3
FROM docker.io/alpine@sha256:c5c5fda71656f28e49ac9c5416b3643eaa6a108a8093151d6d1afc9463be8e33

COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=builder /etc/passwd /etc/passwd
Expand Down
2 changes: 1 addition & 1 deletion traceability/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ go 1.18
replace github.com/Axway/agents-apigee/client => ../client

require (
github.com/Axway/agent-sdk v1.1.61
github.com/Axway/agent-sdk v1.1.63
github.com/Axway/agents-apigee/client v0.0.0-00010101000000-000000000000
github.com/elastic/beats/v7 v7.17.5
github.com/gofrs/uuid v4.2.0+incompatible
Expand Down
4 changes: 2 additions & 2 deletions traceability/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.61 h1:tanMYUO1ylzqG2Nk9V3fJn+d4vhkauexITcA97raFJE=
github.com/Axway/agent-sdk v1.1.61/go.mod h1:IjZ/VyF0fQezmrxSRI7l9jEuOGYl8Hc/XkotLuIYcnw=
github.com/Axway/agent-sdk v1.1.63 h1:4ozpjwU8pqgyBEJ40jzA5rpvKpV69pQ9jMgeVK3ywdk=
github.com/Axway/agent-sdk v1.1.63/go.mod h1:IjZ/VyF0fQezmrxSRI7l9jEuOGYl8Hc/XkotLuIYcnw=
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
github.com/Azure/go-autorest v12.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
Expand Down