Skip to content

Commit 5ca95d2

Browse files
ssvaidyanathanssvaidyanathan
committed
Merge remote-tracking branch 'origin/main' into gh_pages
2 parents 23b911e + 8f22360 commit 5ca95d2

File tree

5 files changed

+26
-30
lines changed

5 files changed

+26
-30
lines changed

‎README.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,12 @@ The following environment variables may be set to control the behavior of `integ
133133
* `INTEGRATIONCLI_NO_ERRORS=true` does not print error messages from the CLI (control plane error messages are displayed)
134134
* `INTEGRATIONCLI_DRYRUN=true` does not execute control plane APIs
135135

136-
## Automate via Cloud Build
137136

138-
Please see [here](https://www.googlecloudcommunity.com/gc/Cloud-Product-Articles/CI-CD-for-Application-Integration/ta-p/722811) for details on how to automate deployments via Cloud Build. The container images for integrationcli are:
137+
## CI/CD
138+
139+
Please see the following community post to learn more about the best practice around CI/CD. These posts covers developing, testing and promoting integrations across different environments:
140+
- [Part 1](https://www.googlecloudcommunity.com/gc/Integration-Services/Part-1-CI-CD-for-Application-Integration/m-p/871711#M1975)
141+
- [Part 2](https://www.googlecloudcommunity.com/gc/Integration-Services/Part-2-CI-CD-for-Application-Integration/m-p/871713#M1976)
139142

140143
## Creating Integration Connectors
141144

@@ -274,10 +277,6 @@ base64 ./test/enc_password.txt > ./test/b64_enc_password.txt # on MacOS, use bas
274277
* [GCS](./test/gcs_connection.json)
275278
* [CloudSQL - MySQL](./test/cloudsql_mysql_connection.json)
276279

277-
## CICD with Application Integration
278-
279-
Please refer to this [article](https://www.googlecloudcommunity.com/gc/Cloud-Product-Articles/CI-CD-for-Application-Integration/ta-p/722811) in Google Cloud Community for how to perform CICD in Application Integration with `integrationcli`
280-
281280
## Samples
282281

283282
Please see [here](./samples/README.md)

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ require (
7979
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
8080
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
8181
go.opentelemetry.io/otel/trace v1.31.0 // indirect
82-
golang.org/x/crypto v0.31.0 // indirect
83-
golang.org/x/net v0.33.0 // indirect
82+
golang.org/x/crypto v0.35.0 // indirect
83+
golang.org/x/net v0.36.0 // indirect
8484
golang.org/x/oauth2 v0.24.0 // indirect
85-
golang.org/x/sync v0.10.0 // indirect
86-
golang.org/x/sys v0.28.0 // indirect
87-
golang.org/x/text v0.21.0 // indirect
85+
golang.org/x/sync v0.11.0 // indirect
86+
golang.org/x/sys v0.30.0 // indirect
87+
golang.org/x/text v0.22.0 // indirect
8888
golang.org/x/time v0.8.0 // indirect
8989
google.golang.org/api v0.205.0 // indirect
9090
google.golang.org/genproto v0.0.0-20241104194629-dd2ea8efbc28 // indirect

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HY
165165
go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A=
166166
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
167167
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
168-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
169-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
168+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
169+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
170170
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
171171
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
172172
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -177,26 +177,26 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
177177
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
178178
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
179179
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
180-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
181-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
180+
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
181+
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
182182
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
183183
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
184184
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
185185
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
186186
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
187187
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
188-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
189-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
188+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
189+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
190190
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
191191
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
192192
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
193193
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
194-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
195-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
194+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
195+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
196196
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
197197
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
198-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
199-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
198+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
199+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
200200
golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
201201
golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
202202
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎internal/cmd/integrations/apply.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,6 @@ func processSfdcChannels(sfdcchannelsFolder string) (err error) {
491491
var stat fs.FileInfo
492492
var fileSplitter string
493493
rJSONFiles := regexp.MustCompile(`(\S*)\.json`)
494-
const sfdcNamingConvention = 2 // when file is split with _, the result must be 2
495494

496495
if useUnderscore {
497496
fileSplitter = utils.LegacyFileSplitter
@@ -509,13 +508,11 @@ func processSfdcChannels(sfdcchannelsFolder string) (err error) {
509508
channelFile := filepath.Base(path)
510509
if rJSONFiles.MatchString(channelFile) {
511510
clilog.Info.Printf("Found configuration for sfdc channel: %s\n", channelFile)
512-
sfdcNames := strings.Split(getFilenameWithoutExtension(channelFile), fileSplitter)
513-
if len(sfdcNames) != sfdcNamingConvention {
514-
clilog.Warning.Printf("sfdc chanel file %s does not follow the naming "+
515-
"convention instanceName_channelName.json\n", channelFile)
516-
return nil
517-
}
518-
version, _, err := sfdc.FindChannel(sfdcNames[1], sfdcNames[0])
511+
//channelFile name could be instanceName_channelName.json or instanceName_channelName_e.json
512+
fileName := getFilenameWithoutExtension(channelFile) //instanceName_channelName or instanceName_channelName_e
513+
sfdcNames := strings.Split(fileName, fileSplitter)
514+
name := fileName[len(sfdcNames[0])+len(fileSplitter):] //channelName or channelName_e
515+
version, _, err := sfdc.FindChannel(name, sfdcNames[0])
519516
// create the instance only if the sfdc channel is not found
520517
if err != nil {
521518
channelBytes, err := utils.ReadFile(path)

‎internal/cmd/token/cache.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var CacheCmd = &cobra.Command{
3434
RunE: func(cmd *cobra.Command, args []string) error {
3535
clilog.Init(apiclient.DebugEnabled(),
3636
apiclient.GetPrintOutput(),
37-
apiclient.GetNoCheck(),
37+
apiclient.GetNoOutput(),
3838
apiclient.GetSuppressWarning())
3939
err := apiclient.SetAccessToken()
4040
clilog.Info.Printf("Token %s cached\n", apiclient.GetIntegrationToken())

0 commit comments

Comments
 (0)