Skip to content

Commit 043a5ae

Browse files
jorteljortel
committed
✨ support default creds.
Signed-off-by: Jeff Ortel <[email protected]>
1 parent cbc904a commit 043a5ae

File tree

4 files changed

+36
-17
lines changed

4 files changed

+36
-17
lines changed

‎cmd/injector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ func (r *ResourceInjector) build(md *Metadata) (err error) {
345345
parsed.With(resource.Selector)
346346
switch strings.ToLower(parsed.kind) {
347347
case "identity":
348-
identity, found, nErr := addon.Application.FindIdentity(application.ID, parsed.value)
348+
identity, found, nErr := addon.Application.Identity(application.ID).Find(parsed.value)
349349
if nErr != nil {
350350
err = nErr
351351
return

‎cmd/mode.go

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ func (r *Mode) fetchRepository(application *api.Application) (err error) {
6868
err = errors.New("Application repository not defined.")
6969
return
7070
}
71+
identities, err := r.identityRefs(application.ID)
72+
if err != nil {
73+
return
74+
}
7175
SourceDir = path.Join(
7276
SourceDir,
7377
strings.Split(
@@ -78,7 +82,7 @@ func (r *Mode) fetchRepository(application *api.Application) (err error) {
7882
r.Repository, err = repository.New(
7983
SourceDir,
8084
application.Repository,
81-
application.Identities)
85+
identities)
8286
if err != nil {
8387
return
8488
}
@@ -93,3 +97,16 @@ func (r *Mode) getArtifact() (err error) {
9397
r.path.binary = path.Join(BinDir, path.Base(r.Artifact))
9498
return
9599
}
100+
101+
// identityRefs returns references to identity associate
102+
// with an application including defaults.
103+
func (r *Mode) identityRefs(appId uint) (refs []api.Ref, err error) {
104+
identities, err := addon.Application.Identity(appId).List()
105+
if err != nil {
106+
return
107+
}
108+
for _, identity := range identities {
109+
refs = append(refs, api.Ref{ID: identity.ID})
110+
}
111+
return
112+
}

‎go.mod

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ toolchain go1.22.0
66

77
require (
88
github.com/gin-gonic/gin v1.9.1
9-
github.com/konveyor/analyzer-lsp v0.7.0-alpha.2.0.20250414173818-69f16ed24d65
10-
github.com/konveyor/tackle2-addon v0.7.0-alpha.2.0.20250416134249-7c0f33d51619
11-
github.com/konveyor/tackle2-hub v0.7.0-alpha.2.0.20250417030359-32aba8021fd6
9+
github.com/konveyor/analyzer-lsp v0.7.0-alpha.2.0.20250528164516-ec5a199590bf
10+
github.com/konveyor/tackle2-addon v0.7.0-rc.1.0.20250604115244-17140aad3dd4
11+
github.com/konveyor/tackle2-hub v0.7.0-alpha.2.0.20250603155042-56f863e431f6
1212
github.com/onsi/gomega v1.31.1
1313
github.com/rogpeppe/go-internal v1.10.0
1414
go.lsp.dev/uri v0.3.0
@@ -17,6 +17,8 @@ require (
1717
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
1818
)
1919

20+
replace github.com/konveyor/tackle2-hub => github.com/jortel/tackle2-hub v0.0.0-20250604134621-3093fb53bd40
21+
2022
require (
2123
github.com/Nerzal/gocloak/v13 v13.9.0 // indirect
2224
github.com/PaesslerAG/gval v1.2.2 // indirect
@@ -94,14 +96,14 @@ require (
9496
golang.org/x/arch v0.3.0 // indirect
9597
golang.org/x/crypto v0.26.0 // indirect
9698
golang.org/x/net v0.28.0 // indirect
97-
golang.org/x/oauth2 v0.16.0 // indirect
99+
golang.org/x/oauth2 v0.18.0 // indirect
98100
golang.org/x/sys v0.28.0 // indirect
99101
golang.org/x/term v0.23.0 // indirect
100102
golang.org/x/text v0.17.0 // indirect
101103
golang.org/x/time v0.5.0 // indirect
102104
google.golang.org/appengine v1.6.8 // indirect
103105
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
104-
google.golang.org/grpc v1.62.2 // indirect
106+
google.golang.org/grpc v1.64.1 // indirect
105107
google.golang.org/protobuf v1.34.2 // indirect
106108
gopkg.in/inf.v0 v0.9.1 // indirect
107109
gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55 // indirect

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
140140
github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
141141
github.com/jortel/go-utils v0.1.4 h1:DzrID+gI9urEGkOoXYGYIKA/bozEIxmcYV/4cdVjW58=
142142
github.com/jortel/go-utils v0.1.4/go.mod h1:7vzFYbnb91+ltjjAmCv2jVL4CKX7Onz1i2EQPAvw9Cs=
143+
github.com/jortel/tackle2-hub v0.0.0-20250604134621-3093fb53bd40 h1:imflwNis2/uh60E/Kak4a3+S9pbvR7+w4QJiqql5J6k=
144+
github.com/jortel/tackle2-hub v0.0.0-20250604134621-3093fb53bd40/go.mod h1:RdQChIneyr3sRRg9X9r2f+EYGLVKXVPiFApOSy3Nq0U=
143145
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
144146
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
145147
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -149,12 +151,10 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
149151
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
150152
github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
151153
github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
152-
github.com/konveyor/analyzer-lsp v0.7.0-alpha.2.0.20250414173818-69f16ed24d65 h1:YbN65QMFBX88onRsZm7fsrPTCN/Ty0/17rbm9KOCQKo=
153-
github.com/konveyor/analyzer-lsp v0.7.0-alpha.2.0.20250414173818-69f16ed24d65/go.mod h1:nlSmohI+wwPTzvWXAtHI3PXe7B9RRU5NKnqnu222Ia0=
154-
github.com/konveyor/tackle2-addon v0.7.0-alpha.2.0.20250416134249-7c0f33d51619 h1:BI/0DisZHAGuuQ3PUWNYRQM8M15R5P4WrSeMyHo81lU=
155-
github.com/konveyor/tackle2-addon v0.7.0-alpha.2.0.20250416134249-7c0f33d51619/go.mod h1:Q71YvZ1e7xWH7/CqWOHYWST0Xbq2s3NOrNhDbAsyMPk=
156-
github.com/konveyor/tackle2-hub v0.7.0-alpha.2.0.20250417030359-32aba8021fd6 h1:qQ5xt5aPPyn0yPKcTva5Ro4Eu0SB5PBD0f2nilUkBpQ=
157-
github.com/konveyor/tackle2-hub v0.7.0-alpha.2.0.20250417030359-32aba8021fd6/go.mod h1:QqKePb871tNLi1w6csz5YuGTmaWWaTyjp0GTG56Wxv0=
154+
github.com/konveyor/analyzer-lsp v0.7.0-alpha.2.0.20250528164516-ec5a199590bf h1:zzDuUJmF2wGW1ra+upIMHHEKC9MUfjvD5Ehm4jaX188=
155+
github.com/konveyor/analyzer-lsp v0.7.0-alpha.2.0.20250528164516-ec5a199590bf/go.mod h1:/7nwwqN27iODJy/PBai9W16KH91LrPGx1nwu21+rCOg=
156+
github.com/konveyor/tackle2-addon v0.7.0-rc.1.0.20250604115244-17140aad3dd4 h1:cXh9HGpCMFnmUMdO6/5rbC28pFrhMps5fVyqBqYQk9Y=
157+
github.com/konveyor/tackle2-addon v0.7.0-rc.1.0.20250604115244-17140aad3dd4/go.mod h1:mITXAU1o/8ZdBoGacaTZxXORfFe1q2S74W9RfTHHm7A=
158158
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
159159
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
160160
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -311,8 +311,8 @@ golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
311311
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
312312
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
313313
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
314-
golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ=
315-
golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o=
314+
golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
315+
golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
316316
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
317317
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
318318
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -390,8 +390,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.
390390
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
391391
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
392392
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
393-
google.golang.org/grpc v1.62.2 h1:iEIj1U5qjyBjzkM5nk3Fq+S1IbjbXSyqeULZ1Nfo4AA=
394-
google.golang.org/grpc v1.62.2/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
393+
google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA=
394+
google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0=
395395
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
396396
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
397397
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

0 commit comments

Comments
 (0)