Skip to content

Commit 6da1b9d

Browse files
author
Yago Carlos Fernandez Gou
committed
Resolve conflicts
# Conflicts: # go.sum
1 parent 1f170a5 commit 6da1b9d

File tree

3 files changed

+17
-0
lines changed

3 files changed

+17
-0
lines changed

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ require (
1717
github.com/stackitcloud/stackit-sdk-go/services/edge v0.4.0
1818
github.com/stackitcloud/stackit-sdk-go/services/git v0.10.1
1919
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.0
20+
github.com/stackitcloud/stackit-sdk-go/services/intake v0.4.2
2021
github.com/stackitcloud/stackit-sdk-go/services/kms v1.2.0
2122
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.7.1
2223
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.3

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ github.com/stackitcloud/stackit-sdk-go/services/git v0.10.1 h1:3JKXfI5hdcXcRVBjU
163163
github.com/stackitcloud/stackit-sdk-go/services/git v0.10.1/go.mod h1:3nTaj8IGjNNGYUD2CpuXkXwc5c4giTUmoPggFhjVFxo=
164164
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.0 h1:U/x0tc487X9msMS5yZYjrBAAKrCx87Trmt0kh8JiARA=
165165
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.0/go.mod h1:6+5+RCDfU7eQN3+/SGdOtx7Bq9dEa2FrHz/jflgY1M4=
166+
github.com/stackitcloud/stackit-sdk-go/services/intake v0.4.2 h1:xywfPSTBV6lqcnueI++KsyWvnZTKCfoCVp8/kzT/RXE=
167+
github.com/stackitcloud/stackit-sdk-go/services/intake v0.4.2/go.mod h1:Ki7BldvSi1f5Lhy7iDeBkAhUvgXPCSAsaqFuxrkPDpg=
166168
github.com/stackitcloud/stackit-sdk-go/services/kms v1.2.0 h1:Ar2n9GKmrTN80G/Ta1R+fL5aX5nEoxL6ODVJl3emzho=
167169
github.com/stackitcloud/stackit-sdk-go/services/kms v1.2.0/go.mod h1:sHMFoYvVrkRZcH13DkLvp48nW+ssRVVVuwqJHDGpa5M=
168170
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.7.1 h1:2UKKtBg+E5IFUcZAkRyKz1Km+tsA//zGjFQjVWwaXss=

stackit/internal/testutil/testutil.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,20 @@ func IaaSProviderConfigWithExperiments() string {
209209
)
210210
}
211211

212+
func IntakeProviderConfig() string {
213+
if IntakeCustomEndpoint == "" {
214+
return `provider "stackit" {
215+
default_region = "eu01"
216+
}`
217+
}
218+
return fmt.Sprintf(`
219+
provider "stackit" {
220+
intake_custom_endpoint = "%s"
221+
}`,
222+
IntakeCustomEndpoint,
223+
)
224+
}
225+
212226
func KMSProviderConfig() string {
213227
if KMSCustomEndpoint == "" {
214228
return `

0 commit comments

Comments
 (0)