Skip to content

Commit 50f797d

Browse files
Return error when using inactive k8s paas template v1 (#414)
* upgrade gsclient-go v3.16.0 * print error when deprecated gsk version is set * only consider active gsk templates when setting gsk release * print correct list of active gsk versions
1 parent 3b1553b commit 50f797d

File tree

110 files changed

+2703
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+2703
-138
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/terraform-providers/terraform-provider-gridscale
22

33
require (
44
github.com/aws/aws-sdk-go v1.55.5
5-
github.com/gridscale/gsclient-go/v3 v3.14.1
5+
github.com/gridscale/gsclient-go/v3 v3.16.0
66
github.com/hashicorp/go-version v1.7.0
77
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
88
)
@@ -51,7 +51,7 @@ require (
5151
golang.org/x/crypto v0.23.0 // indirect
5252
golang.org/x/mod v0.16.0 // indirect
5353
golang.org/x/net v0.23.0 // indirect
54-
golang.org/x/sys v0.20.0 // indirect
54+
golang.org/x/sys v0.29.0 // indirect
5555
golang.org/x/text v0.15.0 // indirect
5656
golang.org/x/tools v0.13.0 // indirect
5757
google.golang.org/appengine v1.6.8 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
4646
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
4747
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
4848
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
49-
github.com/gridscale/gsclient-go/v3 v3.14.1 h1:AJkrQuO4TZGxVkZouS1iZ8fZHRqlM97aGFWuGZnkHNE=
50-
github.com/gridscale/gsclient-go/v3 v3.14.1/go.mod h1:0NjkxHexfHQBbmcN03WBF1G4JhZo3Msai50Zcygv+/8=
49+
github.com/gridscale/gsclient-go/v3 v3.16.0 h1:NroV9q8QQn6KIwu4d7qXkvf3Z5YCKtR3rEcYeL9W6+4=
50+
github.com/gridscale/gsclient-go/v3 v3.16.0/go.mod h1:B/xAA91QRonCLb+ScJix4ODj6wHWaDpPwvFHQD2KqsM=
5151
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
5252
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
5353
github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU=
@@ -185,8 +185,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
185185
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
186186
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
187187
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
188-
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
189-
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
188+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
189+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
190190
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
191191
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
192192
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=

gridscale/resource_gridscale_k8s.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,14 +450,18 @@ func deriveK8sTemplateFromGSKVersion(client *gsclient.Client, version string) (*
450450
}
451451

452452
var derived bool
453+
var isActive bool
453454
var versions []string
454455
var template gsclient.PaaSTemplate
455456

456457
for _, paasTemplate := range paasTemplates {
457458
if paasTemplate.Properties.Flavour == k8sTemplateFlavourName {
458-
versions = append(versions, template.Properties.Version)
459+
if paasTemplate.Properties.Active {
460+
versions = append(versions, template.Properties.Version)
461+
}
459462

460463
if paasTemplate.Properties.Version == version {
464+
isActive = paasTemplate.Properties.Active
461465
derived = true
462466
template = paasTemplate
463467
break
@@ -468,6 +472,9 @@ func deriveK8sTemplateFromGSKVersion(client *gsclient.Client, version string) (*
468472
if !derived {
469473
return nil, fmt.Errorf("%v is an invalid gridscale Kubernetes (GSK) version. Valid GSK versions are: %v", version, strings.Join(versions, ", "))
470474
}
475+
if !isActive {
476+
return nil, fmt.Errorf("%v is a deprecated gridscale Kubernetes (GSK) version. Valid GSK versions are: %v", version, strings.Join(versions, ", "))
477+
}
471478
return &template, nil
472479
}
473480

@@ -501,7 +508,7 @@ func deriveK8sTemplateFromRelease(client *gsclient.Client, release, currenTempla
501508
var template gsclient.PaaSTemplate
502509

503510
for _, paasTemplate := range paasTemplates {
504-
if paasTemplate.Properties.Flavour == k8sTemplateFlavourName {
511+
if paasTemplate.Properties.Flavour == k8sTemplateFlavourName && paasTemplate.Properties.Active {
505512
releases = append(releases, paasTemplate.Properties.Release)
506513

507514
if paasTemplate.Properties.Release == release {

vendor/github.com/gridscale/gsclient-go/v3/CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/gridscale/gsclient-go/v3/config.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/gridscale/gsclient-go/v3/paas.go

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/gridscale/gsclient-go/v3/request.go

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/gridscale/gsclient-go/v3/server.go

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/gridscale/gsclient-go/v3/usage.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/sys/LICENSE

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)