Skip to content

Commit 5a1fb01

Browse files
dgghinearootdfeldickgitsbolosan
authored
APIGOV-31994 - validator changes (#1008)
* APIGOV-31994 - validator changes * tests + clean-up * MR changes * replace names * changes * codegen * changes * updates * changes * test changes * fixes + logger changes * use only agent details tag * APIGOV-31994 - fix include path * APIGOV-31994 - fix test status * fix test * modify models * regen * APIGOV-32181 - update x/net library (#1014) * INT - delete accidentally committed files from okta prov spike * APIGOV-32249 - update x/crypto and others (#1018) * tidyyy --------- Co-authored-by: root <root@SL1RD15APP0514.pcloud.axway.int> Co-authored-by: dfeldick <dfeldick@axway.com> Co-authored-by: Shane Bolosan <sbolosan@axway.com>
1 parent 14b8bad commit 5a1fb01

20 files changed

Lines changed: 565 additions & 162 deletions

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ test-sonar: dep
3737
@go test -short -coverpkg=./... -coverprofile=${WORKSPACE}/gocoverage.out -count=1 ${GO_PKG_LIST} -json > ${WORKSPACE}/goreport.json
3838

3939
apiserver-generate: # generate api server resources, prod by default. ex: make apiserver-generate protocol=https host=apicentral.axway.com port=443
40-
docker run --name generator --rm -v $(shell pwd)/scripts/apiserver:/codegen/scripts -v $(shell pwd)/pkg/apic/apiserver:/codegen/output -e PROTOCOL='$(protocol)' -e HOST='$(host)' -e PORT='$(port)' -e DEBUG='$(debug)' -e USERID=$(shell id -u) -e GROUPID=$(shell id -g) -w /codegen/scripts --entrypoint ./apiserver_generate.sh ampc-beano-docker-release-phx.artifactory-phx.ecd.axway.int/base-images/beano-alpine-codegen:latest
40+
docker run --network=host --name generator --rm -v $(shell pwd)/scripts/apiserver:/codegen/scripts -v $(shell pwd)/pkg/apic/apiserver:/codegen/output -e PROTOCOL='$(protocol)' -e HOST='$(host)' -e PORT='$(port)' -e DEBUG='$(debug)' -e USERID=$(shell id -u) -e GROUPID=$(shell id -g) -w /codegen/scripts --entrypoint ./apiserver_generate.sh ampc-beano-docker-release-phx.artifactory-phx.ecd.axway.int/base-images/beano-alpine-codegen:latest
4141

4242
PROTOFILES := $(shell find $(WORKSPACE)/proto -type f -name '*.proto')
4343
PROTOTARGETS := $(PROTOFILES:.proto=.pb.go)

‎go.sum‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -426,10 +426,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
426426
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
427427
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
428428
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
429-
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
430-
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
431-
golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
432-
golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
433429
golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
434430
golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
435431
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -467,10 +463,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
467463
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
468464
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
469465
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
470-
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
471-
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
472-
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
473-
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
474466
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
475467
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
476468
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -509,8 +501,6 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v
509501
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
510502
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
511503
golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
512-
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
513-
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
514504
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
515505
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
516506
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -532,10 +522,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
532522
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
533523
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
534524
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
535-
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
536-
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
537-
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
538-
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
539525
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
540526
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
541527
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -584,16 +570,8 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
584570
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
585571
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
586572
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
587-
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
588-
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
589-
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
590-
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
591573
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
592574
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
593-
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS3R3bVAsdQWI7hvfLHGgh9+lU=
594-
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE=
595-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 h1:O1cMQHRfwNpDfDJerqRoE2oD+AFlyid87D40L/OkkJo=
596-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2/go.mod h1:b7fPSJ0pKZ3ccUh8gnTONJxhn3c/PS6tyzQvyqw4iA8=
597575
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 h1:bTLqdHv7xrGlFbvf5/TXNxy/iUwwdkjhqQTJDjW7aj0=
598576
golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4/go.mod h1:g5NllXBEermZrmR51cJDQxmJUHUOfRAaNyWBM+R+548=
599577
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -605,10 +583,6 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
605583
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
606584
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
607585
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
608-
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
609-
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
610-
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
611-
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
612586
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
613587
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
614588
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -664,10 +638,6 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
664638
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
665639
golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
666640
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
667-
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
668-
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
669-
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
670-
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
671641
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
672642
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
673643
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎pkg/agent/cache/apiservice.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,14 +221,14 @@ func (c *cacheManager) deleteAllServiceInstanceCounts() {
221221
c.instanceCountMap.Flush()
222222
}
223223

224-
func (c *cacheManager) GetAPIServiceInstanceCount(svcName string) int {
224+
func (c *cacheManager) GetAPIServiceInstancesByService(svcName string) []*v1.ResourceInstance {
225225
svc := c.GetAPIServiceWithName(svcName)
226226

227227
// get apiid and primary key
228228
apiID, _ := util.GetAgentDetailsValue(svc, defs.AttrExternalAPIID)
229229
primaryKey, _ := util.GetAgentDetailsValue(svc, defs.AttrExternalAPIPrimaryKey)
230230

231-
count := 0
231+
ris := []*v1.ResourceInstance{}
232232
for _, k := range c.instanceMap.GetKeys() {
233233
item, _ := c.instanceMap.Get(k)
234234
inst, ok := item.(*v1.ResourceInstance)
@@ -238,9 +238,9 @@ func (c *cacheManager) GetAPIServiceInstanceCount(svcName string) int {
238238
instAPIID, _ := util.GetAgentDetailsValue(inst, defs.AttrExternalAPIID)
239239
instPrimary, _ := util.GetAgentDetailsValue(inst, defs.AttrExternalAPIPrimaryKey)
240240
if apiID == instAPIID || primaryKey == instPrimary {
241-
count++
241+
ris = append(ris, inst)
242242
}
243243
}
244244

245-
return count
245+
return ris
246246
}

‎pkg/agent/cache/manager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ type Manager interface {
4949
GetAPIServiceWithAPIID(apiID string) *v1.ResourceInstance
5050
GetAPIServiceWithPrimaryKey(primaryKey string) *v1.ResourceInstance
5151
GetAPIServiceWithName(apiName string) *v1.ResourceInstance
52-
GetAPIServiceInstanceCount(apiName string) int
52+
GetAPIServiceInstancesByService(apiName string) []*v1.ResourceInstance
5353
GetTeamsIDsInAPIServices() []string
5454
DeleteAPIService(apiID string) error
5555

‎pkg/agent/cache/manager_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ func TestAPIServiceInstanceCache(t *testing.T) {
167167
cachedInstance, err := m.GetAPIServiceInstanceByID("id1")
168168
assert.Nil(t, err)
169169
assert.Equal(t, instance1, cachedInstance)
170-
assert.Equal(t, 1, m.GetAPIServiceInstanceCount(api1.Name))
170+
assert.Equal(t, 1, len(m.GetAPIServiceInstancesByService(api1.Name)))
171171

172172
cachedInstance, err = m.GetAPIServiceInstanceByName("name-id1")
173173
assert.Nil(t, err)
174174
assert.Equal(t, instance1, cachedInstance)
175-
assert.Equal(t, 1, m.GetAPIServiceInstanceCount(api1.Name))
175+
assert.Equal(t, 1, len(m.GetAPIServiceInstancesByService(api1.Name)))
176176

177177
err = m.DeleteAPIServiceInstance("id1")
178178
assert.Nil(t, err)
@@ -181,12 +181,12 @@ func TestAPIServiceInstanceCache(t *testing.T) {
181181
cachedInstance, err = m.GetAPIServiceInstanceByID("id1")
182182
assert.NotNil(t, err)
183183
assert.Nil(t, cachedInstance)
184-
assert.Equal(t, 0, m.GetAPIServiceInstanceCount(instance2.Name))
184+
assert.Equal(t, 0, len(m.GetAPIServiceInstancesByService(instance2.Name)))
185185

186186
cachedInstance, err = m.GetAPIServiceInstanceByName("name-id1")
187187
assert.NotNil(t, err)
188188
assert.Nil(t, cachedInstance)
189-
assert.Equal(t, 0, m.GetAPIServiceInstanceCount(instance2.Name))
189+
assert.Equal(t, 0, len(m.GetAPIServiceInstancesByService(instance2.Name)))
190190

191191
m.DeleteAllAPIServiceInstance()
192192
assert.ElementsMatch(t, []string{}, m.GetAPIServiceInstanceKeys())
@@ -240,7 +240,7 @@ func TestCachePersistenc(t *testing.T) {
240240
assert.ElementsMatch(t, m.GetAPIServiceKeys(), m2.GetAPIServiceKeys())
241241
assertResourceInstance(t, api1, persistedAPI)
242242
// instance count not updated properly check
243-
assert.Equal(t, 0, m2.GetAPIServiceInstanceCount(api1.Name))
243+
assert.Equal(t, 0, len(m2.GetAPIServiceInstancesByService(api1.Name)))
244244

245245
persistedInstance, err := m2.GetAPIServiceInstanceByID("id1")
246246
assert.Nil(t, err)

‎pkg/agent/credentialvalidator_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
agentcache "github.com/Axway/agent-sdk/pkg/agent/cache"
88
"github.com/Axway/agent-sdk/pkg/api"
9+
"github.com/Axway/agent-sdk/pkg/apic"
910
v1 "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1"
1011
management "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/management/v1alpha1"
1112
"github.com/Axway/agent-sdk/pkg/apic/provisioning"
@@ -25,6 +26,12 @@ func setupCredCache(expireTime time.Time) {
2526
agent.cacheManager.AddWatchResource(ri)
2627
}
2728

29+
func setupAPICClient(mockResponse []api.MockResponse) {
30+
client, httpClient := apic.GetTestServiceClient()
31+
httpClient.SetResponses(mockResponse)
32+
agent.apicClient = client
33+
}
34+
2835
func TestRegisterCredentialChecker(t *testing.T) {
2936
setupCredCache(time.Time{})
3037
setupAPICClient([]api.MockResponse{})

0 commit comments

Comments
 (0)