permanent token auth added for cloud

Author: 0ndi

docs/index.md

@@ -252,5 +252,5 @@ resource "gcore_lbmember" "lbm2" {
 - **gcore_storage_api** (String) Storage API
 - **ignore_creds_auth_error** (Boolean) Should be set to true when you are gonna to use storage resource with permanent API-token only.
 - **password** (String)
-- **permanent_api_token** (String, Sensitive) A permanent API-token. Implemented for Storage Terraform Resource only. https://support.gcorelabs.com/hc/en-us/articles/360018625617-API-tokens
+- **permanent_api_token** (String, Sensitive) A permanent API-token. Implemented for Storage and Cloud Terraform Resources only. https://support.gcorelabs.com/hc/en-us/articles/360018625617-API-tokens
 - **user_name** (String)

gcore/provider.go

@@ -41,7 +41,7 @@ func Provider() *schema.Provider {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Sensitive:   true,
-				Description: "A permanent API-token. Implemented for Storage Terraform Resource only. https://support.gcorelabs.com/hc/en-us/articles/360018625617-API-tokens",
+				Description: "A permanent API-token. Implemented for Storage and Cloud Terraform Resources only. https://support.gcorelabs.com/hc/en-us/articles/360018625617-API-tokens",
 				DefaultFunc: schema.EnvDefaultFunc("GCORE_PERMANENT_TOKEN", ""),
 			},
 			ProviderOptSkipCredsAuthErr: {
@@ -156,14 +156,23 @@ func providerConfigure(_ context.Context, d *schema.ResourceData) (interface{},
 
 	var diags diag.Diagnostics
 
-	provider, err := gc.AuthenticatedClient(gcorecloud.AuthOptions{
-		APIURL:      api,
-		AuthURL:     platform,
-		Username:    username,
-		Password:    password,
-		AllowReauth: true,
-		ClientID:    clientID,
-	})
+	var err error
+	var provider *gcorecloud.ProviderClient
+	if permanentToken != "" {
+		provider, err = gc.APITokenClient(gcorecloud.APITokenOptions{
+			APIURL:   api,
+			APIToken: permanentToken,
+		})
+	} else {
+		provider, err = gc.AuthenticatedClient(gcorecloud.AuthOptions{
+			APIURL:      api,
+			AuthURL:     platform,
+			Username:    username,
+			Password:    password,
+			AllowReauth: true,
+			ClientID:    clientID,
+		})
+	}
 
 	skipAuthErr, ok := d.GetOk(ProviderOptSkipCredsAuthErr)
 	if err != nil && !(ok == true || skipAuthErr.(bool) == true) {

go.mod

@@ -2,11 +2,13 @@ module github.com/terraform-providers/terraform-provider-gcorelabs
 
 go 1.16
 
+//replace github.com/G-Core/gcorelabscloud-go => /home/ondi/go/src/github.com/G-Core/gcorelabscloud-go
+
 require (
 	github.com/G-Core/g-dns-sdk-go v0.1.2
 	github.com/G-Core/gcorelabs-storage-sdk-go v0.0.9
 	github.com/G-Core/gcorelabscdn-go v0.1.2
-	github.com/G-Core/gcorelabscloud-go v0.4.31
+	github.com/G-Core/gcorelabscloud-go v0.4.32
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-plugin-docs v0.5.0 // indirect
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0

go.sum

@@ -45,13 +45,10 @@ github.com/G-Core/g-dns-sdk-go v0.1.2 h1:XYgsdOtflZH106UUcArhmrfgNpwfqT1PSCAuTf+
 github.com/G-Core/g-dns-sdk-go v0.1.2/go.mod h1:uArGxDKZjXzfIYGoBd9kuXkrd3RbMzv63TzGbyAci/c=
 github.com/G-Core/gcorelabs-storage-sdk-go v0.0.9 h1:6uyKbknI8Q2pIJApPBf6JA0CN5O8bSDU5hBAyoqre8w=
 github.com/G-Core/gcorelabs-storage-sdk-go v0.0.9/go.mod h1:BZef79y4G28n8ic3x6iQWbW+mtpHPSUyJRfIRSkeAJw=
-github.com/G-Core/gcorelabscdn-go v0.0.0-20210503173228-b4ac8b2402ff h1:kIH66Shwb0Y9kvBgykpzmQn2soiHDTCJ/Rr5cQQ1cOk=
-github.com/G-Core/gcorelabscdn-go v0.0.0-20210503173228-b4ac8b2402ff/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
-github.com/G-Core/gcorelabscdn-go v0.1.1 h1:+1tRabILsbhiwQcfvH9TJOkHOwrZUUu8B82kBIgViNM=
-github.com/G-Core/gcorelabscdn-go v0.1.1/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
+github.com/G-Core/gcorelabscdn-go v0.1.2 h1:AiwZY3oIHL4wMJNmIlLgxw4eQmSqtQmkTzrkGpa7ckc=
 github.com/G-Core/gcorelabscdn-go v0.1.2/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
-github.com/G-Core/gcorelabscloud-go v0.4.31 h1:tFpVsaP1LdgIm/Nrwy11Mb62PTLdBWi+Oaqy70JbJqM=
-github.com/G-Core/gcorelabscloud-go v0.4.31/go.mod h1:Z1MF80mWagEUrxygtYkvW/MJEYNmIUPsIEYBB3cKjOM=
+github.com/G-Core/gcorelabscloud-go v0.4.32 h1:HdnTl95rfzpFIJw1lcKuPizPF2kqMe7n41W7NeElGcA=
+github.com/G-Core/gcorelabscloud-go v0.4.32/go.mod h1:Z1MF80mWagEUrxygtYkvW/MJEYNmIUPsIEYBB3cKjOM=
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=