diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go index 740f77b13a..daef1adae9 100644 --- a/pkg/model/bootstrapscript.go +++ b/pkg/model/bootstrapscript.go @@ -230,13 +230,13 @@ func (b *BootstrapScript) buildEnvironmentVariables(cluster *kops.Cluster) (map[ env["SCW_ACCESS_KEY"] = scwAccessKey scwSecretKey := os.Getenv("SCW_SECRET_KEY") - if scwSecretKey != "" { + if scwSecretKey == "" { return nil, fmt.Errorf("SCW_SECRET_KEY has to be set as an environment variable") } env["SCW_SECRET_KEY"] = scwSecretKey scwProjectID := os.Getenv("SCW_DEFAULT_PROJECT_ID") - if scwProjectID != "" { + if scwProjectID == "" { return nil, fmt.Errorf("SCW_DEFAULT_PROJECT_ID has to be set as an environment variable") } env["SCW_DEFAULT_PROJECT_ID"] = scwProjectID diff --git a/pkg/model/scalewaymodel/context.go b/pkg/model/scalewaymodel/context.go new file mode 100644 index 0000000000..d67b89c98e --- /dev/null +++ b/pkg/model/scalewaymodel/context.go @@ -0,0 +1,9 @@ +package scalewaymodel + +import ( + "k8s.io/kops/pkg/model" +) + +type ScwModelContext struct { + *model.KopsModelContext +} diff --git a/upup/pkg/fi/cloudup/scaleway/cloud.go b/upup/pkg/fi/cloudup/scaleway/cloud.go index cb859c0da3..afcbf77375 100644 --- a/upup/pkg/fi/cloudup/scaleway/cloud.go +++ b/upup/pkg/fi/cloudup/scaleway/cloud.go @@ -101,11 +101,11 @@ func NewScwCloud(tags map[string]string) (ScwCloud, error) { return nil, fmt.Errorf("SCW_ACCESS_KEY has to be set as an environment variable") } scwSecretKey := os.Getenv("SCW_SECRET_KEY") - if scwSecretKey != "" { + if scwSecretKey == "" { return nil, fmt.Errorf("SCW_SECRET_KEY has to be set as an environment variable") } scwProjectID := os.Getenv("SCW_DEFAULT_PROJECT_ID") - if scwProjectID != "" { + if scwProjectID == "" { return nil, fmt.Errorf("SCW_DEFAULT_PROJECT_ID has to be set as an environment variable") }