From 294680282e8e1c4afe52c08b71a985e4bf787bc3 Mon Sep 17 00:00:00 2001 From: Nikita Sorokin Date: Mon, 13 Nov 2023 00:59:02 +0300 Subject: [PATCH] 4.5.0 --- CHANGELOG.md | 9 +- Makefile | 2 +- README.md | 5 +- go.mod | 4 +- go.sum | 4 +- internal/controller/controller.go | 152 ++++++++++++------ internal/provider/provider.go | 31 +++- samples/README.md | 2 +- samples/cloudapi/data_account/main.tf | 2 +- .../cloudapi/data_account_audits_list/main.tf | 2 +- .../data_account_computes_list/main.tf | 2 +- .../data_account_consumed_units/main.tf | 2 +- .../main.tf | 2 +- .../data_account_deleted_list/main.tf | 2 +- .../cloudapi/data_account_disks_list/main.tf | 2 +- .../data_account_flipgroups_list/main.tf | 2 +- .../main.tf | 6 +- samples/cloudapi/data_account_list/main.tf | 2 +- .../data_account_reserved_units/main.tf | 2 +- .../main.tf | 6 +- samples/cloudapi/data_account_rg_list/main.tf | 2 +- .../data_account_templates_list/main.tf | 2 +- .../cloudapi/data_account_vins_list/main.tf | 2 +- samples/cloudapi/data_bservice/main.tf | 2 +- .../data_bservice_deleted_list/main.tf | 2 +- samples/cloudapi/data_bservice_group/main.tf | 2 +- samples/cloudapi/data_bservice_list/main.tf | 2 +- .../data_bservice_snapshot_list/main.tf | 2 +- samples/cloudapi/data_disk/main.tf | 2 +- samples/cloudapi/data_disk_list/main.tf | 2 +- .../cloudapi/data_disk_list_deleted/main.tf | 2 +- samples/cloudapi/data_disk_list_types/main.tf | 2 +- .../data_disk_list_types_detailed/main.tf | 2 +- .../data_disk_list_unattached/main.tf | 2 +- samples/cloudapi/data_disk_snapshot/main.tf | 2 +- .../cloudapi/data_disk_snapshot_list/main.tf | 2 +- samples/cloudapi/data_extnet/main.tf | 2 +- .../data_extnet_computes_list/main.tf | 2 +- samples/cloudapi/data_extnet_default/main.tf | 2 +- samples/cloudapi/data_extnet_list/main.tf | 2 +- samples/cloudapi/data_flipgroup/main.tf | 11 +- samples/cloudapi/data_flipgroup_list/main.tf | 11 +- samples/cloudapi/data_image/main.tf | 2 +- samples/cloudapi/data_image_list/main.tf | 2 +- samples/cloudapi/data_k8ci_list/main.tf | 2 +- samples/cloudapi/data_k8s/main.tf | 2 +- samples/cloudapi/data_k8s_computes/main.tf | 11 +- samples/cloudapi/data_k8s_list/main.tf | 2 +- .../cloudapi/data_k8s_list_deleted/main.tf | 2 +- samples/cloudapi/data_k8s_wg/main.tf | 2 +- .../cloudapi/data_k8s_wg_cloud_init/main.tf | 2 +- samples/cloudapi/data_k8s_wg_list/main.tf | 2 +- samples/cloudapi/data_kvmvm/main.tf | 2 +- samples/cloudapi/data_kvmvm_audits/main.tf | 2 +- .../cloudapi/data_kvmvm_get_audits/main.tf | 2 +- .../data_kvmvm_get_console_url/main.tf | 2 +- samples/cloudapi/data_kvmvm_get_log/main.tf | 2 +- samples/cloudapi/data_kvmvm_list/main.tf | 2 +- .../cloudapi/data_kvmvm_list_deleted/main.tf | 2 +- .../data_kvmvm_pci_device_list/main.tf | 2 +- samples/cloudapi/data_kvmvm_pfw_list/main.tf | 2 +- samples/cloudapi/data_kvmvm_user_list/main.tf | 2 +- samples/cloudapi/data_kvmvm_vgpu_list/main.tf | 2 +- samples/cloudapi/data_lb/main.tf | 2 +- samples/cloudapi/data_lb_list/main.tf | 2 +- samples/cloudapi/data_lb_list_deleted/main.tf | 2 +- samples/cloudapi/data_locations_list/main.tf | 2 +- samples/cloudapi/data_rg/main.tf | 2 +- .../data_rg_affinity_group_computes/main.tf | 2 +- .../data_rg_affinity_groups_get/main.tf | 2 +- .../data_rg_affinity_groups_list/main.tf | 2 +- samples/cloudapi/data_rg_audits/main.tf | 2 +- .../data_rg_get_resource_consumption/main.tf | 6 +- samples/cloudapi/data_rg_list/main.tf | 2 +- .../cloudapi/data_rg_list_computes/main.tf | 2 +- samples/cloudapi/data_rg_list_deleted/main.tf | 2 +- samples/cloudapi/data_rg_list_lb/main.tf | 2 +- samples/cloudapi/data_rg_list_pfw/main.tf | 2 +- samples/cloudapi/data_rg_list_vins/main.tf | 2 +- .../data_rg_resource_consumption_list/main.tf | 6 +- samples/cloudapi/data_rg_usage/main.tf | 2 +- samples/cloudapi/data_snapshot_list/main.tf | 4 +- samples/cloudapi/data_stack/main.tf | 6 +- samples/cloudapi/data_stack_list/main.tf | 7 +- samples/cloudapi/data_vgpu/main.tf | 2 +- samples/cloudapi/data_vins/main.tf | 2 +- samples/cloudapi/data_vins_audits/main.tf | 2 +- .../cloudapi/data_vins_ext_net_list/main.tf | 2 +- samples/cloudapi/data_vins_ip_list/main.tf | 2 +- samples/cloudapi/data_vins_list/main.tf | 2 +- .../cloudapi/data_vins_list_deleted/main.tf | 2 +- .../cloudapi/data_vins_nat_rule_list/main.tf | 2 +- .../cloudapi/data_vins_static_route/main.tf | 4 +- .../data_vins_static_route_list/main.tf | 4 +- samples/cloudapi/resource_account/main.tf | 2 +- samples/cloudapi/resource_bservice/main.tf | 2 +- .../cloudapi/resource_bservice_group/main.tf | 2 +- samples/cloudapi/resource_disk/main.tf | 3 +- .../cloudapi/resource_disk_snapshot/main.tf | 2 +- samples/cloudapi/resource_flipgroup/main.tf | 11 +- samples/cloudapi/resource_image/main.tf | 11 +- .../cloudapi/resource_image_virtual/main.tf | 4 +- samples/cloudapi/resource_k8s/main.tf | 2 +- samples/cloudapi/resource_k8s_cp/main.tf | 11 +- samples/cloudapi/resource_k8s_wg/main.tf | 11 +- samples/cloudapi/resource_kvmvm/main.tf | 2 +- samples/cloudapi/resource_lb/main.tf | 2 +- samples/cloudapi/resource_lb_backend/main.tf | 2 +- .../resource_lb_backend_server/main.tf | 2 +- samples/cloudapi/resource_lb_frontend/main.tf | 2 +- .../resource_lb_frontend_bind/main.tf | 2 +- samples/cloudapi/resource_pfw/main.tf | 11 +- samples/cloudapi/resource_rg/main.tf | 2 +- samples/cloudapi/resource_snapshot/main.tf | 4 +- samples/cloudapi/resource_vins/main.tf | 4 +- .../resource_vins_static_route/main.tf | 4 +- samples/cloudbroker/data_account/main.tf | 2 +- .../data_account_audits_list/main.tf | 2 +- .../data_account_computes_list/main.tf | 2 +- .../data_account_deleted_list/main.tf | 2 +- .../data_account_disks_list/main.tf | 2 +- .../data_account_flipgroups_list/main.tf | 2 +- .../main.tf | 6 +- samples/cloudbroker/data_account_list/main.tf | 2 +- .../main.tf | 6 +- .../cloudbroker/data_account_rg_list/main.tf | 2 +- .../data_account_vins_list/main.tf | 2 +- samples/cloudbroker/data_disk/main.tf | 2 +- samples/cloudbroker/data_disk_list/main.tf | 2 +- samples/cloudbroker/data_extnet/main.tf | 2 +- .../cloudbroker/data_extnet_default/main.tf | 2 +- samples/cloudbroker/data_extnet_list/main.tf | 2 +- .../data_extnet_static_route/main.tf | 4 +- .../data_extnet_static_route_list/main.tf | 4 +- samples/cloudbroker/data_grid/main.tf | 2 +- samples/cloudbroker/data_grid_list/main.tf | 2 +- samples/cloudbroker/data_image/main.tf | 2 +- samples/cloudbroker/data_image_list/main.tf | 2 +- .../data_image_list_stacks/main.tf | 2 +- samples/cloudbroker/data_pcidevice/main.tf | 4 +- .../cloudbroker/data_pcidevice_list/main.tf | 4 +- samples/cloudbroker/data_sep/main.tf | 2 +- samples/cloudbroker/data_sep_config/main.tf | 2 +- .../cloudbroker/data_sep_consumption/main.tf | 2 +- .../cloudbroker/data_sep_disk_list/main.tf | 2 +- samples/cloudbroker/data_sep_list/main.tf | 2 +- samples/cloudbroker/data_sep_pool/main.tf | 2 +- samples/cloudbroker/resource_account/main.tf | 2 +- .../resource_delete_images/main.tf | 2 +- samples/cloudbroker/resource_disk/main.tf | 4 +- samples/cloudbroker/resource_extnet/main.tf | 2 +- .../resource_extnet_static_route/main.tf | 4 +- samples/cloudbroker/resource_image/main.tf | 2 +- .../cloudbroker/resource_image_cdrom/main.tf | 2 +- .../cloudbroker/resource_pcidevice/main.tf | 3 +- samples/cloudbroker/resource_sep/main.tf | 2 +- .../cloudbroker/resource_sep_config/main.tf | 2 +- .../resource_virtual_image/main.tf | 2 +- 158 files changed, 362 insertions(+), 280 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e373239..211bd65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ -## Version 4.5.0-alfa +## Version 4.5.0 + +## Feature +- Added support for authorization using the Basis.Virtual Security system. Add client and config ### Bugfix -- Fixed bservice and rg schema and flatten -- Add stateUpgrader for k8s_cp +- Fixed bservice and rg schema and flatten in cloudapi +- Add stateUpgrader for k8s_cp in cloudapi/k8s diff --git a/Makefile b/Makefile index 2c9b820..aef969e 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ ZIPDIR = ./zip BINARY=${NAME} WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH} MAINPATH = ./cmd/decort/ -VERSION=4.5.0-alfa +VERSION=4.5.0 OS_ARCH=$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH) FILES = ${BINARY}_${VERSION}_darwin_amd64\ diff --git a/README.md b/README.md index 04a44fe..c5e0a07 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Terraform provider для платформы Digital Energy Cloud Orchestration | Версия DECORT API | Версия провайдера Terraform | | ------ | ------ | +| 3.8.9 | 4.5.x | | 3.8.8 | 4.4.x | | 3.8.7 | 4.3.x | | 3.8.6 | 4.0.x, 4.1.x, 4.2.x | @@ -89,7 +90,7 @@ terraform { 9. Добавьте в файл блок с инициализацией провайдера. ```terraform provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" controller_url = "https://mr4.digitalenergy.online" oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true @@ -175,7 +176,7 @@ ${host_name}/${namespace}/${type} 8. Добавьте в файл блок с инициализацией провайдера. ```terraform provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" controller_url = "https://mr4.digitalenergy.online" oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true diff --git a/go.mod b/go.mod index 4aeee0b..7a5a849 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,8 @@ require ( github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1 github.com/sirupsen/logrus v1.9.0 golang.org/x/net v0.16.0 - repository.basistech.ru/BASIS/decort-golang-sdk v1.6.9 + golang.org/x/oauth2 v0.13.0 + repository.basistech.ru/BASIS/decort-golang-sdk v1.7.0 ) require ( @@ -68,7 +69,6 @@ require ( github.com/vmihailenco/tagparser v0.1.2 // indirect github.com/zclconf/go-cty v1.12.1 // indirect golang.org/x/crypto v0.14.0 // indirect - golang.org/x/oauth2 v0.13.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index 63176ea..f4d743d 100644 --- a/go.sum +++ b/go.sum @@ -341,5 +341,5 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -repository.basistech.ru/BASIS/decort-golang-sdk v1.6.9 h1:FaQQol7gx4i/IzaScGbiVxJpLkBOgG2bOp+De1kW0hY= -repository.basistech.ru/BASIS/decort-golang-sdk v1.6.9/go.mod h1:mwcpnw0dT/PQf6AOJShjlbDNDfNitr0WM77LNKL1qjo= +repository.basistech.ru/BASIS/decort-golang-sdk v1.7.0 h1:aGDg9hQXs70m4Llx8hw9Y50M1C2apDqSsNMsE8isyIM= +repository.basistech.ru/BASIS/decort-golang-sdk v1.7.0/go.mod h1:mwcpnw0dT/PQf6AOJShjlbDNDfNitr0WM77LNKL1qjo= diff --git a/internal/controller/controller.go b/internal/controller/controller.go index 00be789..3e1bf3b 100644 --- a/internal/controller/controller.go +++ b/internal/controller/controller.go @@ -1,5 +1,5 @@ /* -Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved. +Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved. Authors: Petr Krutov, Stanislav Solovev, @@ -24,15 +24,15 @@ import ( "bytes" "crypto/tls" "fmt" - "io/ioutil" + "io" + "net/http" "net/url" "strconv" "strings" - // "time" - log "github.com/sirupsen/logrus" + "golang.org/x/oauth2" decort "repository.basistech.ru/BASIS/decort-golang-sdk" "repository.basistech.ru/BASIS/decort-golang-sdk/config" "repository.basistech.ru/BASIS/decort-golang-sdk/interfaces" @@ -46,24 +46,29 @@ import ( // enumerated constants that define authentication modes const ( - MODE_UNDEF = iota // this is the invalid mode - it should never be seen - MODE_LEGACY = iota - MODE_OAUTH2 = iota - MODE_JWT = iota + MODE_UNDEF = iota // this is the invalid mode - it should never be seen + MODE_LEGACY + MODE_DECS3O + MODE_JWT + MODE_BVS ) type ControllerCfg struct { controller_url string // always required auth_mode_code int // always required auth_mode_txt string // always required, it is a text representation of auth mode + bvs_user string // required for bvs mode + bvs_password string // required for bvs mode + domain string // required for bvs mode + token oauth2.Token // obtained from BVS provider on successful login in bvs mode legacy_user string // required for legacy mode legacy_password string // required for legacy mode legacy_sid string // obtained from DECORT controller on successful login in legacy mode - jwt string // obtained from Outh2 provider on successful login in oauth2 mode, required in jwt mode - app_id string // required for oauth2 mode - app_secret string // required for oauth2 mode - oauth2_url string // always required - decort_username string // assigned to either legacy_user (legacy mode) or Oauth2 user (oauth2 mode) upon successful verification + jwt string // obtained from Outh2 provider on successful login in decs3o mode, required in jwt mode + app_id string // required for decs3o and bvs mode + app_secret string // required for decs3o and bvs mode + oauth2_url string // required for decs3o and bvs mode + decort_username string // assigned to either legacy_user (legacy mode) or Oauth2 user (decs3o mode) upon successful verification cc_client *http.Client // assigned when all initial checks successfully passed caller interfaces.Caller } @@ -86,17 +91,21 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) { legacy_user: d.Get("user").(string), legacy_password: d.Get("password").(string), legacy_sid: "", + bvs_user: d.Get("bvs_user").(string), + bvs_password: d.Get("bvs_password").(string), + domain: d.Get("domain").(string), jwt: d.Get("jwt").(string), app_id: d.Get("app_id").(string), app_secret: d.Get("app_secret").(string), oauth2_url: d.Get("oauth2_url").(string), decort_username: "", + token: oauth2.Token{}, } allow_unverified_ssl := d.Get("allow_unverified_ssl").(bool) if ret_config.controller_url == "" { - return nil, fmt.Errorf("Empty DECORT cloud controller URL provided.") + return nil, fmt.Errorf("empty DECORT cloud controller URL provided") } // this should have already been done by StateFunc defined in Schema, but we want to be sure @@ -105,33 +114,53 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) { switch ret_config.auth_mode_txt { case "jwt": if ret_config.jwt == "" { - return nil, fmt.Errorf("Authenticator mode 'jwt' specified but no JWT provided.") + return nil, fmt.Errorf("authenticator mode 'jwt' specified but no JWT provided") } ret_config.auth_mode_code = MODE_JWT - case "oauth2": + case "decs3o": if ret_config.oauth2_url == "" { - return nil, fmt.Errorf("Authenticator mode 'oauth2' specified but no OAuth2 URL provided.") + return nil, fmt.Errorf("authenticator mode 'decs3o' specified but no OAuth2 URL provided") } if ret_config.app_id == "" { - return nil, fmt.Errorf("Authenticator mode 'oauth2' specified but no Application ID provided.") + return nil, fmt.Errorf("authenticator mode 'decs3o' specified but no Application ID provided") } if ret_config.app_secret == "" { - return nil, fmt.Errorf("Authenticator mode 'oauth2' specified but no Secret ID provided.") + return nil, fmt.Errorf("authenticator mode 'decs3o' specified but no Secret ID provided") } - ret_config.auth_mode_code = MODE_OAUTH2 + ret_config.auth_mode_code = MODE_DECS3O case "legacy": // ret_config.legacy_user = d.Get("user").(string) if ret_config.legacy_user == "" { - return nil, fmt.Errorf("Authenticator mode 'legacy' specified but no user provided.") + return nil, fmt.Errorf("authenticator mode 'legacy' specified but no user provided") } ret_config.legacy_password = d.Get("password").(string) if ret_config.legacy_password == "" { - return nil, fmt.Errorf("Authenticator mode 'legacy' specified but no password provided.") + return nil, fmt.Errorf("authenticator mode 'legacy' specified but no password provided") } ret_config.auth_mode_code = MODE_LEGACY + case "bvs": + if ret_config.bvs_user == "" { + return nil, fmt.Errorf("authenticator mode 'bvs' specified but no user provided") + } + if ret_config.bvs_password == "" { + return nil, fmt.Errorf("authenticator mode 'bvs' specified but no password provided") + } + if ret_config.oauth2_url == "" { + return nil, fmt.Errorf("authenticator mode 'bvs' specified but no bvs URL provided") + } + if ret_config.app_id == "" { + return nil, fmt.Errorf("authenticator mode 'bvs' specified but no Application ID provided") + } + if ret_config.app_secret == "" { + return nil, fmt.Errorf("authenticator mode 'bvs' specified but no Secret ID provided") + } + if ret_config.domain == "" { + return nil, fmt.Errorf("authenticator mode 'bvs' specified but no Domain provided") + } + ret_config.auth_mode_code = MODE_BVS default: - return nil, fmt.Errorf("Unknown authenticator mode %q provided.", ret_config.auth_mode_txt) + return nil, fmt.Errorf("unknown authenticator mode %q provided", ret_config.auth_mode_txt) } if allow_unverified_ssl { @@ -167,10 +196,10 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) { if !ok { return nil, err } - case MODE_OAUTH2: - // on success getOAuth2JWT will set config.jwt to the obtained JWT, so there is no + case MODE_DECS3O: + // on success getDECS3OJWT will set config.jwt to the obtained JWT, so there is no // need to set it once again here - _, err := ret_config.getOAuth2JWT() + _, err := ret_config.getDECS3OJWT() if err != nil { return nil, err } @@ -189,7 +218,7 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) { tbuf.WriteString(claims["iss"].(string)) ret_config.decort_username = tbuf.String() } else { - return nil, fmt.Errorf("Failed to extract user and iss fields from JWT token in oauth2 mode.") + return nil, fmt.Errorf("failed to extract user and iss fields from JWT token in oauth2 mode") } sdkConf := config.Config{ @@ -201,10 +230,24 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) { } ret_config.caller = decort.New(sdkConf) + case MODE_BVS: + + sdkConf := config.BVSConfig{ + AppID: ret_config.app_id, + AppSecret: ret_config.app_secret, + SSOURL: ret_config.oauth2_url, + DecortURL: ret_config.controller_url, + SSLSkipVerify: allow_unverified_ssl, + Username: ret_config.bvs_user, + Password: ret_config.bvs_password, + Domain: ret_config.domain, + Token: ret_config.token, + } + ret_config.caller = decort.NewBVS(sdkConf) default: // FYI, this should never happen due to all above checks, but we want to be fool proof - return nil, fmt.Errorf("Unknown authenticator mode code %d provided.", ret_config.auth_mode_code) + return nil, fmt.Errorf("unknown authenticator mode code %d provided", ret_config.auth_mode_code) } // All checks passed successfully, credentials corresponding to the selected authenticator mode @@ -216,13 +259,13 @@ func (config *ControllerCfg) GetDecortUsername() string { return config.decort_username } -func (config *ControllerCfg) getOAuth2JWT() (string, error) { +func (config *ControllerCfg) getDECS3OJWT() (string, error) { // Obtain JWT from the Oauth2 provider using application ID and application secret provided in config. if config.auth_mode_code == MODE_UNDEF { - return "", fmt.Errorf("getOAuth2JWT method called for undefined authorization mode.") + return "", fmt.Errorf("getOAuth2JWT method called for undefined authorization mode") } - if config.auth_mode_code != MODE_OAUTH2 { - return "", fmt.Errorf("getOAuth2JWT method called for incompatible authorization mode %q.", config.auth_mode_txt) + if config.auth_mode_code != MODE_DECS3O { + return "", fmt.Errorf("getOAuth2JWT method called for incompatible authorization mode %q", config.auth_mode_txt) } params := url.Values{} @@ -253,7 +296,7 @@ func (config *ControllerCfg) getOAuth2JWT() (string, error) { } defer resp.Body.Close() - responseData, err := ioutil.ReadAll(resp.Body) + responseData, err := io.ReadAll(resp.Body) if err != nil { return "", err } @@ -273,13 +316,13 @@ func (config *ControllerCfg) validateJWT(jwt string) (bool, error) { */ if jwt == "" { if config.jwt == "" { - return false, fmt.Errorf("validateJWT method called, but no meaningful JWT provided.") + return false, fmt.Errorf("validateJWT method called, but no meaningful JWT provided") } jwt = config.jwt } if config.oauth2_url == "" { - return false, fmt.Errorf("validateJWT method called, but no OAuth2 URL provided.") + return false, fmt.Errorf("validateJWT method called, but no OAuth2 URL provided") } req, err := http.NewRequest("POST", config.controller_url+"/restmachine/cloudapi/account/list", nil) @@ -296,7 +339,7 @@ func (config *ControllerCfg) validateJWT(jwt string) (bool, error) { return false, err } if resp.StatusCode != http.StatusOK { - return false, fmt.Errorf("validateJWT: unexpected status code %d when validating JWT against %q.", + return false, fmt.Errorf("validateJWT: unexpected status code %d when validating JWT against %q", resp.StatusCode, req.URL) } defer resp.Body.Close() @@ -312,10 +355,10 @@ func (config *ControllerCfg) validateLegacyUser() (bool, error) { reason, the method will return false and error. */ if config.auth_mode_code == MODE_UNDEF { - return false, fmt.Errorf("validateLegacyUser method called for undefined authorization mode.") + return false, fmt.Errorf("validateLegacyUser method called for undefined authorization mode") } if config.auth_mode_code != MODE_LEGACY { - return false, fmt.Errorf("validateLegacyUser method called for incompatible authorization mode %q.", config.auth_mode_txt) + return false, fmt.Errorf("validateLegacyUser method called for incompatible authorization mode %q", config.auth_mode_txt) } params := url.Values{} @@ -336,12 +379,12 @@ func (config *ControllerCfg) validateLegacyUser() (bool, error) { return false, err } if resp.StatusCode != http.StatusOK { - return false, fmt.Errorf("validateLegacyUser: unexpected status code %d when validating legacy user %q against %q.", + return false, fmt.Errorf("validateLegacyUser: unexpected status code %d when validating legacy user %q against %q", resp.StatusCode, config.legacy_user, config.controller_url) } defer resp.Body.Close() - responseData, err := ioutil.ReadAll(resp.Body) + responseData, err := io.ReadAll(req.Body) if err != nil { log.Fatal(err) } @@ -353,21 +396,32 @@ func (config *ControllerCfg) validateLegacyUser() (bool, error) { } func (config *ControllerCfg) CloudAPI() *cloudapi.CloudAPI { - if config.auth_mode_code == MODE_LEGACY { + switch config.auth_mode_code { + case MODE_LEGACY: client, _ := config.caller.(*decort.LegacyDecortClient) return client.CloudAPI() + case MODE_DECS3O: + client, _ := config.caller.(*decort.DecortClient) + return client.CloudAPI() + case MODE_BVS: + client, _ := config.caller.(*decort.BVSDecortClient) + return client.CloudAPI() + default: + return &cloudapi.CloudAPI{} } - - client, _ := config.caller.(*decort.DecortClient) - return client.CloudAPI() } - func (config *ControllerCfg) CloudBroker() *cloudbroker.CloudBroker { - if config.auth_mode_code == MODE_LEGACY { + switch config.auth_mode_code { + case MODE_LEGACY: client, _ := config.caller.(*decort.LegacyDecortClient) return client.CloudBroker() + case MODE_DECS3O: + client, _ := config.caller.(*decort.DecortClient) + return client.CloudBroker() + case MODE_BVS: + client, _ := config.caller.(*decort.BVSDecortClient) + return client.CloudBroker() + default: + return &cloudbroker.CloudBroker{} } - - client, _ := config.caller.(*decort.DecortClient) - return client.CloudBroker() } diff --git a/internal/provider/provider.go b/internal/provider/provider.go index 6134e45..259a078 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -40,8 +40,8 @@ func Provider() *schema.Provider { Type: schema.TypeString, Required: true, StateFunc: statefuncs.StateFuncToLower, - ValidateFunc: validation.StringInSlice([]string{"oauth2", "legacy", "jwt"}, true), // ignore case while validating - Description: "Authentication mode to use when connecting to DECORT cloud API. Should be one of 'oauth2', 'legacy' or 'jwt'.", + ValidateFunc: validation.StringInSlice([]string{"decs3o", "legacy", "jwt", "bvs"}, true), // ignore case while validating + Description: "Authentication mode to use when connecting to DECORT cloud API. Should be one of 'decs3o', 'legacy', 'jwt' or 'bvs'.", }, "oauth2_url": { @@ -49,7 +49,7 @@ func Provider() *schema.Provider { Optional: true, StateFunc: statefuncs.StateFuncToLower, DefaultFunc: schema.EnvDefaultFunc("DECORT_OAUTH2_URL", nil), - Description: "OAuth2 application URL in 'oauth2' authentication mode.", + Description: "OAuth2 application URL in 'decs3o' and 'bvs' authentication mode.", }, "controller_url": { @@ -74,18 +74,39 @@ func Provider() *schema.Provider { Description: "User password for DECORT cloud API operations in 'legacy' authentication mode.", }, + "bvs_user": { + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("DECORT_BVS_USER", nil), + Description: "User name for DECORT cloud API operations in 'bvs' authentication mode.", + }, + + "bvs_password": { + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("DECORT_BVS_PASSWORD", nil), + Description: "User password for DECORT cloud API operations in 'bvs' authentication mode.", + }, + + "domain": { + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("DECORT_DOMAIN", nil), + Description: "User password for DECORT cloud API operations in 'bvs' authentication mode.", + }, + "app_id": { Type: schema.TypeString, Optional: true, DefaultFunc: schema.EnvDefaultFunc("DECORT_APP_ID", nil), - Description: "Application ID to access DECORT cloud API in 'oauth2' authentication mode.", + Description: "Application ID to access DECORT cloud API in 'decs3o' and 'bvs' authentication mode.", }, "app_secret": { Type: schema.TypeString, Optional: true, DefaultFunc: schema.EnvDefaultFunc("DECORT_APP_SECRET", nil), - Description: "Application secret to access DECORT cloud API in 'oauth2' authentication mode.", + Description: "Application secret to access DECORT cloud API in 'decs3o' and 'bvs' authentication mode.", }, "jwt": { diff --git a/samples/README.md b/samples/README.md index 4a3d2a2..49d940c 100644 --- a/samples/README.md +++ b/samples/README.md @@ -116,7 +116,7 @@ 1. Установить terraform 2. Установить terraform-provider-decort с помощью команды `terraform init` (выполняется автоматически), либо вручную. 3. Заменить параметр _controller_url_ на ваш. -4. Заменить параметр _oauth2_ на ваш. +4. Заменить параметр _oauth2_url_ на ваш. 5. Добавить ключи _DECORT_APP_SECRET_ и _DECORT_APP_ID_ в качестве переменных окружения, либо diff --git a/samples/cloudapi/data_account/main.tf b/samples/cloudapi/data_account/main.tf index a6fd6a3..2691054 100644 --- a/samples/cloudapi/data_account/main.tf +++ b/samples/cloudapi/data_account/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_account_audits_list/main.tf b/samples/cloudapi/data_account_audits_list/main.tf index 150deb8..86a3bb0 100644 --- a/samples/cloudapi/data_account_audits_list/main.tf +++ b/samples/cloudapi/data_account_audits_list/main.tf @@ -19,7 +19,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_account_computes_list/main.tf b/samples/cloudapi/data_account_computes_list/main.tf index 0ac1da2..5927386 100644 --- a/samples/cloudapi/data_account_computes_list/main.tf +++ b/samples/cloudapi/data_account_computes_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_account_consumed_units/main.tf b/samples/cloudapi/data_account_consumed_units/main.tf index 74e0798..373a0c5 100644 --- a/samples/cloudapi/data_account_consumed_units/main.tf +++ b/samples/cloudapi/data_account_consumed_units/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_account_consumed_units_by_type/main.tf b/samples/cloudapi/data_account_consumed_units_by_type/main.tf index 8d981a4..026885f 100644 --- a/samples/cloudapi/data_account_consumed_units_by_type/main.tf +++ b/samples/cloudapi/data_account_consumed_units_by_type/main.tf @@ -22,7 +22,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_account_deleted_list/main.tf b/samples/cloudapi/data_account_deleted_list/main.tf index 5baadd0..f00b2c7 100644 --- a/samples/cloudapi/data_account_deleted_list/main.tf +++ b/samples/cloudapi/data_account_deleted_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_account_disks_list/main.tf b/samples/cloudapi/data_account_disks_list/main.tf index 6ddd77c..5f65d5f 100644 --- a/samples/cloudapi/data_account_disks_list/main.tf +++ b/samples/cloudapi/data_account_disks_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_account_flipgroups_list/main.tf b/samples/cloudapi/data_account_flipgroups_list/main.tf index 174b78b..dcaf205 100644 --- a/samples/cloudapi/data_account_flipgroups_list/main.tf +++ b/samples/cloudapi/data_account_flipgroups_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_account_get_resource_consumption/main.tf b/samples/cloudapi/data_account_get_resource_consumption/main.tf index 50d6100..0f60f98 100644 --- a/samples/cloudapi/data_account_get_resource_consumption/main.tf +++ b/samples/cloudapi/data_account_get_resource_consumption/main.tf @@ -16,11 +16,11 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://alpha.dev.decs.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = - oauth2_url = "https://sso-alpha.dev.decs.online" + oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true } diff --git a/samples/cloudapi/data_account_list/main.tf b/samples/cloudapi/data_account_list/main.tf index 3457892..cfc827a 100644 --- a/samples/cloudapi/data_account_list/main.tf +++ b/samples/cloudapi/data_account_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_account_reserved_units/main.tf b/samples/cloudapi/data_account_reserved_units/main.tf index 70b1de1..b00c0e3 100644 --- a/samples/cloudapi/data_account_reserved_units/main.tf +++ b/samples/cloudapi/data_account_reserved_units/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_account_resource_consumption_list/main.tf b/samples/cloudapi/data_account_resource_consumption_list/main.tf index f452e5d..d69dbfa 100644 --- a/samples/cloudapi/data_account_resource_consumption_list/main.tf +++ b/samples/cloudapi/data_account_resource_consumption_list/main.tf @@ -16,11 +16,11 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://alpha.dev.decs.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = - oauth2_url = "https://sso-alpha.dev.decs.online" + oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true } diff --git a/samples/cloudapi/data_account_rg_list/main.tf b/samples/cloudapi/data_account_rg_list/main.tf index 04a135f..5bb6671 100644 --- a/samples/cloudapi/data_account_rg_list/main.tf +++ b/samples/cloudapi/data_account_rg_list/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_account_templates_list/main.tf b/samples/cloudapi/data_account_templates_list/main.tf index 09fcb63..fb7a610 100644 --- a/samples/cloudapi/data_account_templates_list/main.tf +++ b/samples/cloudapi/data_account_templates_list/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_account_vins_list/main.tf b/samples/cloudapi/data_account_vins_list/main.tf index 45f8cfa..5b319c3 100644 --- a/samples/cloudapi/data_account_vins_list/main.tf +++ b/samples/cloudapi/data_account_vins_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_bservice/main.tf b/samples/cloudapi/data_bservice/main.tf index 856c429..43fb722 100644 --- a/samples/cloudapi/data_bservice/main.tf +++ b/samples/cloudapi/data_bservice/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_bservice_deleted_list/main.tf b/samples/cloudapi/data_bservice_deleted_list/main.tf index aed390a..9172fae 100644 --- a/samples/cloudapi/data_bservice_deleted_list/main.tf +++ b/samples/cloudapi/data_bservice_deleted_list/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_bservice_group/main.tf b/samples/cloudapi/data_bservice_group/main.tf index 4a72bd0..48beb9c 100644 --- a/samples/cloudapi/data_bservice_group/main.tf +++ b/samples/cloudapi/data_bservice_group/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_bservice_list/main.tf b/samples/cloudapi/data_bservice_list/main.tf index cde478a..71f2a17 100644 --- a/samples/cloudapi/data_bservice_list/main.tf +++ b/samples/cloudapi/data_bservice_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_bservice_snapshot_list/main.tf b/samples/cloudapi/data_bservice_snapshot_list/main.tf index 16d1cac..317e183 100644 --- a/samples/cloudapi/data_bservice_snapshot_list/main.tf +++ b/samples/cloudapi/data_bservice_snapshot_list/main.tf @@ -19,7 +19,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_disk/main.tf b/samples/cloudapi/data_disk/main.tf index 2e6c639..32ef443 100644 --- a/samples/cloudapi/data_disk/main.tf +++ b/samples/cloudapi/data_disk/main.tf @@ -17,7 +17,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_disk_list/main.tf b/samples/cloudapi/data_disk_list/main.tf index 0a798ec..20c39c9 100644 --- a/samples/cloudapi/data_disk_list/main.tf +++ b/samples/cloudapi/data_disk_list/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_disk_list_deleted/main.tf b/samples/cloudapi/data_disk_list_deleted/main.tf index 26d39ad..118f101 100644 --- a/samples/cloudapi/data_disk_list_deleted/main.tf +++ b/samples/cloudapi/data_disk_list_deleted/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_disk_list_types/main.tf b/samples/cloudapi/data_disk_list_types/main.tf index 2ca65a0..a7c160a 100644 --- a/samples/cloudapi/data_disk_list_types/main.tf +++ b/samples/cloudapi/data_disk_list_types/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_disk_list_types_detailed/main.tf b/samples/cloudapi/data_disk_list_types_detailed/main.tf index ed30c5d..47b9d75 100644 --- a/samples/cloudapi/data_disk_list_types_detailed/main.tf +++ b/samples/cloudapi/data_disk_list_types_detailed/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_disk_list_unattached/main.tf b/samples/cloudapi/data_disk_list_unattached/main.tf index e6077b3..5d97266 100644 --- a/samples/cloudapi/data_disk_list_unattached/main.tf +++ b/samples/cloudapi/data_disk_list_unattached/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_disk_snapshot/main.tf b/samples/cloudapi/data_disk_snapshot/main.tf index 6b68452..f7f5790 100644 --- a/samples/cloudapi/data_disk_snapshot/main.tf +++ b/samples/cloudapi/data_disk_snapshot/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_disk_snapshot_list/main.tf b/samples/cloudapi/data_disk_snapshot_list/main.tf index 6278547..8003250 100644 --- a/samples/cloudapi/data_disk_snapshot_list/main.tf +++ b/samples/cloudapi/data_disk_snapshot_list/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_extnet/main.tf b/samples/cloudapi/data_extnet/main.tf index 5b99390..b465b79 100644 --- a/samples/cloudapi/data_extnet/main.tf +++ b/samples/cloudapi/data_extnet/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_extnet_computes_list/main.tf b/samples/cloudapi/data_extnet_computes_list/main.tf index 5816d1d..7a1e06b 100644 --- a/samples/cloudapi/data_extnet_computes_list/main.tf +++ b/samples/cloudapi/data_extnet_computes_list/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_extnet_default/main.tf b/samples/cloudapi/data_extnet_default/main.tf index a422f2c..bfbc74f 100644 --- a/samples/cloudapi/data_extnet_default/main.tf +++ b/samples/cloudapi/data_extnet_default/main.tf @@ -19,7 +19,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_extnet_list/main.tf b/samples/cloudapi/data_extnet_list/main.tf index f989c68..1410492 100644 --- a/samples/cloudapi/data_extnet_list/main.tf +++ b/samples/cloudapi/data_extnet_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_flipgroup/main.tf b/samples/cloudapi/data_flipgroup/main.tf index 05b7010..20b5104 100644 --- a/samples/cloudapi/data_flipgroup/main.tf +++ b/samples/cloudapi/data_flipgroup/main.tf @@ -13,11 +13,12 @@ terraform { */ provider "decort" { - authenticator = "oauth2" - oauth2_url = "https://sso.digitalenergy.online" - controller_url = "https://mr4.digitalenergy.online" - app_id = "" - app_secret = "" + authenticator = "decs3o" + #controller_url = + controller_url = "https://ds1.digitalenergy.online" + #oauth2_url = + oauth2_url = "https://sso.digitalenergy.online" + allow_unverified_ssl = true } data "decort_flipgroup" "fg" { diff --git a/samples/cloudapi/data_flipgroup_list/main.tf b/samples/cloudapi/data_flipgroup_list/main.tf index 767aa62..0012021 100644 --- a/samples/cloudapi/data_flipgroup_list/main.tf +++ b/samples/cloudapi/data_flipgroup_list/main.tf @@ -13,11 +13,12 @@ terraform { */ provider "decort" { - authenticator = "oauth2" - oauth2_url = "https://sso.digitalenergy.online" - controller_url = "https://mr4.digitalenergy.online" - app_id = "" - app_secret = "" + authenticator = "decs3o" + #controller_url = + controller_url = "https://ds1.digitalenergy.online" + #oauth2_url = + oauth2_url = "https://sso.digitalenergy.online" + allow_unverified_ssl = true } data "decort_flipgroup_list" "fg" { diff --git a/samples/cloudapi/data_image/main.tf b/samples/cloudapi/data_image/main.tf index e7bc553..2f70535 100644 --- a/samples/cloudapi/data_image/main.tf +++ b/samples/cloudapi/data_image/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_image_list/main.tf b/samples/cloudapi/data_image_list/main.tf index fabafb7..eb477d8 100644 --- a/samples/cloudapi/data_image_list/main.tf +++ b/samples/cloudapi/data_image_list/main.tf @@ -17,7 +17,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_k8ci_list/main.tf b/samples/cloudapi/data_k8ci_list/main.tf index 0e7d0d2..119d237 100644 --- a/samples/cloudapi/data_k8ci_list/main.tf +++ b/samples/cloudapi/data_k8ci_list/main.tf @@ -17,7 +17,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_k8s/main.tf b/samples/cloudapi/data_k8s/main.tf index 826118d..fe28e85 100644 --- a/samples/cloudapi/data_k8s/main.tf +++ b/samples/cloudapi/data_k8s/main.tf @@ -17,7 +17,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_k8s_computes/main.tf b/samples/cloudapi/data_k8s_computes/main.tf index 7577f63..8814965 100644 --- a/samples/cloudapi/data_k8s_computes/main.tf +++ b/samples/cloudapi/data_k8s_computes/main.tf @@ -13,11 +13,12 @@ terraform { */ provider "decort" { - authenticator = "oauth2" - oauth2_url = "https://sso.digitalenergy.online" - controller_url = "https://mr4.digitalenergy.online" - app_id = "" - app_secret = "" + authenticator = "decs3o" + #controller_url = + controller_url = "https://ds1.digitalenergy.online" + #oauth2_url = + oauth2_url = "https://sso.digitalenergy.online" + allow_unverified_ssl = true } data "decort_k8s_computes" "computes" { diff --git a/samples/cloudapi/data_k8s_list/main.tf b/samples/cloudapi/data_k8s_list/main.tf index 16a0312..a058a68 100644 --- a/samples/cloudapi/data_k8s_list/main.tf +++ b/samples/cloudapi/data_k8s_list/main.tf @@ -17,7 +17,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_k8s_list_deleted/main.tf b/samples/cloudapi/data_k8s_list_deleted/main.tf index 91f4dc4..f9975bd 100644 --- a/samples/cloudapi/data_k8s_list_deleted/main.tf +++ b/samples/cloudapi/data_k8s_list_deleted/main.tf @@ -17,7 +17,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_k8s_wg/main.tf b/samples/cloudapi/data_k8s_wg/main.tf index c906418..c08877f 100644 --- a/samples/cloudapi/data_k8s_wg/main.tf +++ b/samples/cloudapi/data_k8s_wg/main.tf @@ -17,7 +17,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_k8s_wg_cloud_init/main.tf b/samples/cloudapi/data_k8s_wg_cloud_init/main.tf index 2d6d66f..e7da906 100644 --- a/samples/cloudapi/data_k8s_wg_cloud_init/main.tf +++ b/samples/cloudapi/data_k8s_wg_cloud_init/main.tf @@ -17,7 +17,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_k8s_wg_list/main.tf b/samples/cloudapi/data_k8s_wg_list/main.tf index 8bc3ac1..39e875a 100644 --- a/samples/cloudapi/data_k8s_wg_list/main.tf +++ b/samples/cloudapi/data_k8s_wg_list/main.tf @@ -17,7 +17,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_kvmvm/main.tf b/samples/cloudapi/data_kvmvm/main.tf index 3a483cb..603086c 100644 --- a/samples/cloudapi/data_kvmvm/main.tf +++ b/samples/cloudapi/data_kvmvm/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_kvmvm_audits/main.tf b/samples/cloudapi/data_kvmvm_audits/main.tf index f88aceb..45f8ec6 100644 --- a/samples/cloudapi/data_kvmvm_audits/main.tf +++ b/samples/cloudapi/data_kvmvm_audits/main.tf @@ -16,7 +16,7 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_kvmvm_get_audits/main.tf b/samples/cloudapi/data_kvmvm_get_audits/main.tf index 039ee93..c2ec8ec 100644 --- a/samples/cloudapi/data_kvmvm_get_audits/main.tf +++ b/samples/cloudapi/data_kvmvm_get_audits/main.tf @@ -16,7 +16,7 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_kvmvm_get_console_url/main.tf b/samples/cloudapi/data_kvmvm_get_console_url/main.tf index 521d1e3..81d3b93 100644 --- a/samples/cloudapi/data_kvmvm_get_console_url/main.tf +++ b/samples/cloudapi/data_kvmvm_get_console_url/main.tf @@ -16,7 +16,7 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_kvmvm_get_log/main.tf b/samples/cloudapi/data_kvmvm_get_log/main.tf index efe3cc4..2858b5f 100644 --- a/samples/cloudapi/data_kvmvm_get_log/main.tf +++ b/samples/cloudapi/data_kvmvm_get_log/main.tf @@ -16,7 +16,7 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_kvmvm_list/main.tf b/samples/cloudapi/data_kvmvm_list/main.tf index 905e31a..25926e1 100644 --- a/samples/cloudapi/data_kvmvm_list/main.tf +++ b/samples/cloudapi/data_kvmvm_list/main.tf @@ -16,7 +16,7 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_kvmvm_list_deleted/main.tf b/samples/cloudapi/data_kvmvm_list_deleted/main.tf index a94aaa0..2d3d9dd 100644 --- a/samples/cloudapi/data_kvmvm_list_deleted/main.tf +++ b/samples/cloudapi/data_kvmvm_list_deleted/main.tf @@ -16,7 +16,7 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_kvmvm_pci_device_list/main.tf b/samples/cloudapi/data_kvmvm_pci_device_list/main.tf index 73a87a1..1cb86d6 100644 --- a/samples/cloudapi/data_kvmvm_pci_device_list/main.tf +++ b/samples/cloudapi/data_kvmvm_pci_device_list/main.tf @@ -16,7 +16,7 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_kvmvm_pfw_list/main.tf b/samples/cloudapi/data_kvmvm_pfw_list/main.tf index 5a8c836..b3cd17f 100644 --- a/samples/cloudapi/data_kvmvm_pfw_list/main.tf +++ b/samples/cloudapi/data_kvmvm_pfw_list/main.tf @@ -16,7 +16,7 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_kvmvm_user_list/main.tf b/samples/cloudapi/data_kvmvm_user_list/main.tf index 278fefa..02723c1 100644 --- a/samples/cloudapi/data_kvmvm_user_list/main.tf +++ b/samples/cloudapi/data_kvmvm_user_list/main.tf @@ -16,7 +16,7 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_kvmvm_vgpu_list/main.tf b/samples/cloudapi/data_kvmvm_vgpu_list/main.tf index d86cea3..c5c5745 100644 --- a/samples/cloudapi/data_kvmvm_vgpu_list/main.tf +++ b/samples/cloudapi/data_kvmvm_vgpu_list/main.tf @@ -16,7 +16,7 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_lb/main.tf b/samples/cloudapi/data_lb/main.tf index f7d8aeb..9c6d68c 100644 --- a/samples/cloudapi/data_lb/main.tf +++ b/samples/cloudapi/data_lb/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_lb_list/main.tf b/samples/cloudapi/data_lb_list/main.tf index 2c352a3..6e97ff8 100644 --- a/samples/cloudapi/data_lb_list/main.tf +++ b/samples/cloudapi/data_lb_list/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_lb_list_deleted/main.tf b/samples/cloudapi/data_lb_list_deleted/main.tf index 6284ece..6481a84 100644 --- a/samples/cloudapi/data_lb_list_deleted/main.tf +++ b/samples/cloudapi/data_lb_list_deleted/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_locations_list/main.tf b/samples/cloudapi/data_locations_list/main.tf index cf5481c..25b4ec2 100644 --- a/samples/cloudapi/data_locations_list/main.tf +++ b/samples/cloudapi/data_locations_list/main.tf @@ -20,7 +20,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_rg/main.tf b/samples/cloudapi/data_rg/main.tf index d7bfecd..721f801 100644 --- a/samples/cloudapi/data_rg/main.tf +++ b/samples/cloudapi/data_rg/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_rg_affinity_group_computes/main.tf b/samples/cloudapi/data_rg_affinity_group_computes/main.tf index ff3c71f..d81a5e5 100644 --- a/samples/cloudapi/data_rg_affinity_group_computes/main.tf +++ b/samples/cloudapi/data_rg_affinity_group_computes/main.tf @@ -16,7 +16,7 @@ } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_rg_affinity_groups_get/main.tf b/samples/cloudapi/data_rg_affinity_groups_get/main.tf index 8772261..8b0e7d0 100644 --- a/samples/cloudapi/data_rg_affinity_groups_get/main.tf +++ b/samples/cloudapi/data_rg_affinity_groups_get/main.tf @@ -17,7 +17,7 @@ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_rg_affinity_groups_list/main.tf b/samples/cloudapi/data_rg_affinity_groups_list/main.tf index 86fc3e2..d192185 100644 --- a/samples/cloudapi/data_rg_affinity_groups_list/main.tf +++ b/samples/cloudapi/data_rg_affinity_groups_list/main.tf @@ -16,7 +16,7 @@ } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_rg_audits/main.tf b/samples/cloudapi/data_rg_audits/main.tf index cc737e8..546fbd8 100644 --- a/samples/cloudapi/data_rg_audits/main.tf +++ b/samples/cloudapi/data_rg_audits/main.tf @@ -16,7 +16,7 @@ } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_rg_get_resource_consumption/main.tf b/samples/cloudapi/data_rg_get_resource_consumption/main.tf index 2875255..495a1ab 100644 --- a/samples/cloudapi/data_rg_get_resource_consumption/main.tf +++ b/samples/cloudapi/data_rg_get_resource_consumption/main.tf @@ -16,11 +16,11 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://alpha.dev.decs.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = - oauth2_url = "https://sso-alpha.dev.decs.online" + oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true } diff --git a/samples/cloudapi/data_rg_list/main.tf b/samples/cloudapi/data_rg_list/main.tf index 9fcbcb4..9ee9504 100644 --- a/samples/cloudapi/data_rg_list/main.tf +++ b/samples/cloudapi/data_rg_list/main.tf @@ -16,7 +16,7 @@ } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_rg_list_computes/main.tf b/samples/cloudapi/data_rg_list_computes/main.tf index d552637..6dd2d06 100644 --- a/samples/cloudapi/data_rg_list_computes/main.tf +++ b/samples/cloudapi/data_rg_list_computes/main.tf @@ -16,7 +16,7 @@ } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_rg_list_deleted/main.tf b/samples/cloudapi/data_rg_list_deleted/main.tf index f7e21de..d118109 100644 --- a/samples/cloudapi/data_rg_list_deleted/main.tf +++ b/samples/cloudapi/data_rg_list_deleted/main.tf @@ -16,7 +16,7 @@ } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_rg_list_lb/main.tf b/samples/cloudapi/data_rg_list_lb/main.tf index 508a6a0..6b123ba 100644 --- a/samples/cloudapi/data_rg_list_lb/main.tf +++ b/samples/cloudapi/data_rg_list_lb/main.tf @@ -16,7 +16,7 @@ } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_rg_list_pfw/main.tf b/samples/cloudapi/data_rg_list_pfw/main.tf index 1db0d6e..03d81c0 100644 --- a/samples/cloudapi/data_rg_list_pfw/main.tf +++ b/samples/cloudapi/data_rg_list_pfw/main.tf @@ -16,7 +16,7 @@ } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_rg_list_vins/main.tf b/samples/cloudapi/data_rg_list_vins/main.tf index e775b7f..8eb0c1b 100644 --- a/samples/cloudapi/data_rg_list_vins/main.tf +++ b/samples/cloudapi/data_rg_list_vins/main.tf @@ -16,7 +16,7 @@ } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_rg_resource_consumption_list/main.tf b/samples/cloudapi/data_rg_resource_consumption_list/main.tf index c2dc9d0..a4e8b92 100644 --- a/samples/cloudapi/data_rg_resource_consumption_list/main.tf +++ b/samples/cloudapi/data_rg_resource_consumption_list/main.tf @@ -16,11 +16,11 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://alpha.dev.decs.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = - oauth2_url = "https://sso-alpha.dev.decs.online" + oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true } diff --git a/samples/cloudapi/data_rg_usage/main.tf b/samples/cloudapi/data_rg_usage/main.tf index 49bbf53..858ad8c 100644 --- a/samples/cloudapi/data_rg_usage/main.tf +++ b/samples/cloudapi/data_rg_usage/main.tf @@ -16,7 +16,7 @@ } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_snapshot_list/main.tf b/samples/cloudapi/data_snapshot_list/main.tf index 4962f9a..f160291 100644 --- a/samples/cloudapi/data_snapshot_list/main.tf +++ b/samples/cloudapi/data_snapshot_list/main.tf @@ -19,9 +19,9 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://mr4.digitalenergy.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true diff --git a/samples/cloudapi/data_stack/main.tf b/samples/cloudapi/data_stack/main.tf index 0e83532..185733d 100644 --- a/samples/cloudapi/data_stack/main.tf +++ b/samples/cloudapi/data_stack/main.tf @@ -16,11 +16,11 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://alpha.dev.decs.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = - oauth2_url = "https://sso-alpha.dev.decs.online" + oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true } diff --git a/samples/cloudapi/data_stack_list/main.tf b/samples/cloudapi/data_stack_list/main.tf index 2b18b66..a3de1aa 100644 --- a/samples/cloudapi/data_stack_list/main.tf +++ b/samples/cloudapi/data_stack_list/main.tf @@ -16,14 +16,13 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://alpha.dev.decs.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = - oauth2_url = "https://sso-alpha.dev.decs.online" + oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true } - data "decort_stack_list" "stack_list" { #необязательный параметр #тип - число diff --git a/samples/cloudapi/data_vgpu/main.tf b/samples/cloudapi/data_vgpu/main.tf index 536b18b..8c2530b 100644 --- a/samples/cloudapi/data_vgpu/main.tf +++ b/samples/cloudapi/data_vgpu/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_vins/main.tf b/samples/cloudapi/data_vins/main.tf index a26b504..009e6cf 100644 --- a/samples/cloudapi/data_vins/main.tf +++ b/samples/cloudapi/data_vins/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_vins_audits/main.tf b/samples/cloudapi/data_vins_audits/main.tf index 69d0742..5e510fc 100644 --- a/samples/cloudapi/data_vins_audits/main.tf +++ b/samples/cloudapi/data_vins_audits/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_vins_ext_net_list/main.tf b/samples/cloudapi/data_vins_ext_net_list/main.tf index bcf6536..2abac95 100644 --- a/samples/cloudapi/data_vins_ext_net_list/main.tf +++ b/samples/cloudapi/data_vins_ext_net_list/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_vins_ip_list/main.tf b/samples/cloudapi/data_vins_ip_list/main.tf index 253885d..81d8e65 100644 --- a/samples/cloudapi/data_vins_ip_list/main.tf +++ b/samples/cloudapi/data_vins_ip_list/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_vins_list/main.tf b/samples/cloudapi/data_vins_list/main.tf index ce045d4..166cd6d 100644 --- a/samples/cloudapi/data_vins_list/main.tf +++ b/samples/cloudapi/data_vins_list/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_vins_list_deleted/main.tf b/samples/cloudapi/data_vins_list_deleted/main.tf index 659685c..583b7e4 100644 --- a/samples/cloudapi/data_vins_list_deleted/main.tf +++ b/samples/cloudapi/data_vins_list_deleted/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_vins_nat_rule_list/main.tf b/samples/cloudapi/data_vins_nat_rule_list/main.tf index 98084a4..e86aefc 100644 --- a/samples/cloudapi/data_vins_nat_rule_list/main.tf +++ b/samples/cloudapi/data_vins_nat_rule_list/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/data_vins_static_route/main.tf b/samples/cloudapi/data_vins_static_route/main.tf index 6220575..db99f36 100644 --- a/samples/cloudapi/data_vins_static_route/main.tf +++ b/samples/cloudapi/data_vins_static_route/main.tf @@ -25,9 +25,9 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://mr4.digitalenergy.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true diff --git a/samples/cloudapi/data_vins_static_route_list/main.tf b/samples/cloudapi/data_vins_static_route_list/main.tf index afd3d16..05e001e 100644 --- a/samples/cloudapi/data_vins_static_route_list/main.tf +++ b/samples/cloudapi/data_vins_static_route_list/main.tf @@ -25,9 +25,9 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://mr4.digitalenergy.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true diff --git a/samples/cloudapi/resource_account/main.tf b/samples/cloudapi/resource_account/main.tf index 023977e..9580a38 100644 --- a/samples/cloudapi/resource_account/main.tf +++ b/samples/cloudapi/resource_account/main.tf @@ -22,7 +22,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/resource_bservice/main.tf b/samples/cloudapi/resource_bservice/main.tf index d7b5717..f1585c6 100644 --- a/samples/cloudapi/resource_bservice/main.tf +++ b/samples/cloudapi/resource_bservice/main.tf @@ -25,7 +25,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/resource_bservice_group/main.tf b/samples/cloudapi/resource_bservice_group/main.tf index 5d0c8d8..c4a0493 100644 --- a/samples/cloudapi/resource_bservice_group/main.tf +++ b/samples/cloudapi/resource_bservice_group/main.tf @@ -21,7 +21,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/resource_disk/main.tf b/samples/cloudapi/resource_disk/main.tf index ee49878..5581c98 100644 --- a/samples/cloudapi/resource_disk/main.tf +++ b/samples/cloudapi/resource_disk/main.tf @@ -17,7 +17,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = @@ -30,7 +30,6 @@ resource "decort_disk" "acl" { gid = 212 disk_name = "super-disk-re" size_max = 20 - restore = true permanently = true reason = "delete" shareable = false diff --git a/samples/cloudapi/resource_disk_snapshot/main.tf b/samples/cloudapi/resource_disk_snapshot/main.tf index 114c42e..ca4f577 100644 --- a/samples/cloudapi/resource_disk_snapshot/main.tf +++ b/samples/cloudapi/resource_disk_snapshot/main.tf @@ -17,7 +17,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/resource_flipgroup/main.tf b/samples/cloudapi/resource_flipgroup/main.tf index 61cc54f..e9428ca 100644 --- a/samples/cloudapi/resource_flipgroup/main.tf +++ b/samples/cloudapi/resource_flipgroup/main.tf @@ -13,11 +13,12 @@ terraform { */ provider "decort" { - authenticator = "oauth2" - oauth2_url = "https://sso.digitalenergy.online" - controller_url = "https://mr4.digitalenergy.online" - app_id = "" - app_secret = "" + authenticator = "decs3o" + #controller_url = + controller_url = "https://ds1.digitalenergy.online" + #oauth2_url = + oauth2_url = "https://sso.digitalenergy.online" + allow_unverified_ssl = true } resource "decort_flipgroup" "fg" { diff --git a/samples/cloudapi/resource_image/main.tf b/samples/cloudapi/resource_image/main.tf index 7648cef..d01cb97 100644 --- a/samples/cloudapi/resource_image/main.tf +++ b/samples/cloudapi/resource_image/main.tf @@ -13,11 +13,12 @@ terraform { */ provider "decort" { - authenticator = "oauth2" - oauth2_url = "https://sso.digitalenergy.online" - controller_url = "https://mr4.digitalenergy.online" - app_id = "" - app_secret = "" + authenticator = "decs3o" + #controller_url = + controller_url = "https://ds1.digitalenergy.online" + #oauth2_url = + oauth2_url = "https://sso.digitalenergy.online" + allow_unverified_ssl = true } resource "decort_image" "img" { diff --git a/samples/cloudapi/resource_image_virtual/main.tf b/samples/cloudapi/resource_image_virtual/main.tf index d65ecc1..bc9e8c7 100644 --- a/samples/cloudapi/resource_image_virtual/main.tf +++ b/samples/cloudapi/resource_image_virtual/main.tf @@ -25,9 +25,9 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://mr4.digitalenergy.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true diff --git a/samples/cloudapi/resource_k8s/main.tf b/samples/cloudapi/resource_k8s/main.tf index 62d141b..dc5f826 100644 --- a/samples/cloudapi/resource_k8s/main.tf +++ b/samples/cloudapi/resource_k8s/main.tf @@ -13,7 +13,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/resource_k8s_cp/main.tf b/samples/cloudapi/resource_k8s_cp/main.tf index f206b40..7103bc4 100644 --- a/samples/cloudapi/resource_k8s_cp/main.tf +++ b/samples/cloudapi/resource_k8s_cp/main.tf @@ -13,11 +13,12 @@ terraform { */ provider "decort" { - authenticator = "oauth2" - oauth2_url = "https://sso.digitalenergy.online" - controller_url = "https://mr4.digitalenergy.online" - app_id = "" - app_secret = "" + authenticator = "decs3o" + #controller_url = + controller_url = "https://ds1.digitalenergy.online" + #oauth2_url = + oauth2_url = "https://sso.digitalenergy.online" + allow_unverified_ssl = true } resource "decort_k8s_cp" "cp" { diff --git a/samples/cloudapi/resource_k8s_wg/main.tf b/samples/cloudapi/resource_k8s_wg/main.tf index 0d853ff..39bd348 100644 --- a/samples/cloudapi/resource_k8s_wg/main.tf +++ b/samples/cloudapi/resource_k8s_wg/main.tf @@ -14,11 +14,12 @@ terraform { */ provider "decort" { - authenticator = "oauth2" - oauth2_url = "https://sso.digitalenergy.online" - controller_url = "https://mr4.digitalenergy.online" - app_id = "" - app_secret = "" + authenticator = "decs3o" + #controller_url = + controller_url = "https://ds1.digitalenergy.online" + #oauth2_url = + oauth2_url = "https://sso.digitalenergy.online" + allow_unverified_ssl = true } diff --git a/samples/cloudapi/resource_kvmvm/main.tf b/samples/cloudapi/resource_kvmvm/main.tf index b0626c2..5b0d227 100644 --- a/samples/cloudapi/resource_kvmvm/main.tf +++ b/samples/cloudapi/resource_kvmvm/main.tf @@ -22,7 +22,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/resource_lb/main.tf b/samples/cloudapi/resource_lb/main.tf index 2a9f924..e530372 100644 --- a/samples/cloudapi/resource_lb/main.tf +++ b/samples/cloudapi/resource_lb/main.tf @@ -22,7 +22,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/resource_lb_backend/main.tf b/samples/cloudapi/resource_lb_backend/main.tf index 7dc00f2..b98b3df 100644 --- a/samples/cloudapi/resource_lb_backend/main.tf +++ b/samples/cloudapi/resource_lb_backend/main.tf @@ -22,7 +22,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/resource_lb_backend_server/main.tf b/samples/cloudapi/resource_lb_backend_server/main.tf index a5edee5..f20e09c 100644 --- a/samples/cloudapi/resource_lb_backend_server/main.tf +++ b/samples/cloudapi/resource_lb_backend_server/main.tf @@ -22,7 +22,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/resource_lb_frontend/main.tf b/samples/cloudapi/resource_lb_frontend/main.tf index 4e32580..12ee631 100644 --- a/samples/cloudapi/resource_lb_frontend/main.tf +++ b/samples/cloudapi/resource_lb_frontend/main.tf @@ -21,7 +21,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/resource_lb_frontend_bind/main.tf b/samples/cloudapi/resource_lb_frontend_bind/main.tf index 0b15ecd..40cd7ef 100644 --- a/samples/cloudapi/resource_lb_frontend_bind/main.tf +++ b/samples/cloudapi/resource_lb_frontend_bind/main.tf @@ -22,7 +22,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/resource_pfw/main.tf b/samples/cloudapi/resource_pfw/main.tf index ea28cfb..650e977 100644 --- a/samples/cloudapi/resource_pfw/main.tf +++ b/samples/cloudapi/resource_pfw/main.tf @@ -13,11 +13,12 @@ terraform { */ provider "decort" { - authenticator = "oauth2" - oauth2_url = "https://sso.digitalenergy.online" - controller_url = "https://mr4.digitalenergy.online" - app_id = "" - app_secret = "" + authenticator = "decs3o" + #controller_url = + controller_url = "https://ds1.digitalenergy.online" + #oauth2_url = + oauth2_url = "https://sso.digitalenergy.online" + allow_unverified_ssl = true } resource "decort_pfw" "pfw" { diff --git a/samples/cloudapi/resource_rg/main.tf b/samples/cloudapi/resource_rg/main.tf index 88eeb02..4da35be 100644 --- a/samples/cloudapi/resource_rg/main.tf +++ b/samples/cloudapi/resource_rg/main.tf @@ -21,7 +21,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudapi/resource_snapshot/main.tf b/samples/cloudapi/resource_snapshot/main.tf index 08544ba..a410b7c 100644 --- a/samples/cloudapi/resource_snapshot/main.tf +++ b/samples/cloudapi/resource_snapshot/main.tf @@ -23,9 +23,9 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://mr4.digitalenergy.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true diff --git a/samples/cloudapi/resource_vins/main.tf b/samples/cloudapi/resource_vins/main.tf index 666be5f..d1cc025 100644 --- a/samples/cloudapi/resource_vins/main.tf +++ b/samples/cloudapi/resource_vins/main.tf @@ -27,9 +27,9 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://mr4.digitalenergy.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true diff --git a/samples/cloudapi/resource_vins_static_route/main.tf b/samples/cloudapi/resource_vins_static_route/main.tf index 00270b4..9b1588a 100644 --- a/samples/cloudapi/resource_vins_static_route/main.tf +++ b/samples/cloudapi/resource_vins_static_route/main.tf @@ -25,9 +25,9 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://mr4.digitalenergy.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true diff --git a/samples/cloudbroker/data_account/main.tf b/samples/cloudbroker/data_account/main.tf index 17759f5..ab83117 100644 --- a/samples/cloudbroker/data_account/main.tf +++ b/samples/cloudbroker/data_account/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_account_audits_list/main.tf b/samples/cloudbroker/data_account_audits_list/main.tf index af918f4..0b6997f 100644 --- a/samples/cloudbroker/data_account_audits_list/main.tf +++ b/samples/cloudbroker/data_account_audits_list/main.tf @@ -19,7 +19,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_account_computes_list/main.tf b/samples/cloudbroker/data_account_computes_list/main.tf index bc98058..21fe102 100644 --- a/samples/cloudbroker/data_account_computes_list/main.tf +++ b/samples/cloudbroker/data_account_computes_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_account_deleted_list/main.tf b/samples/cloudbroker/data_account_deleted_list/main.tf index 57c66be..a8e72b5 100644 --- a/samples/cloudbroker/data_account_deleted_list/main.tf +++ b/samples/cloudbroker/data_account_deleted_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_account_disks_list/main.tf b/samples/cloudbroker/data_account_disks_list/main.tf index 9007390..5b60f7c 100644 --- a/samples/cloudbroker/data_account_disks_list/main.tf +++ b/samples/cloudbroker/data_account_disks_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_account_flipgroups_list/main.tf b/samples/cloudbroker/data_account_flipgroups_list/main.tf index 9b570d2..89dae3d 100644 --- a/samples/cloudbroker/data_account_flipgroups_list/main.tf +++ b/samples/cloudbroker/data_account_flipgroups_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_account_get_resource_consumption/main.tf b/samples/cloudbroker/data_account_get_resource_consumption/main.tf index 44b2560..b46ecbc 100644 --- a/samples/cloudbroker/data_account_get_resource_consumption/main.tf +++ b/samples/cloudbroker/data_account_get_resource_consumption/main.tf @@ -16,11 +16,11 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://alpha.dev.decs.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = - oauth2_url = "https://sso-alpha.dev.decs.online" + oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true } diff --git a/samples/cloudbroker/data_account_list/main.tf b/samples/cloudbroker/data_account_list/main.tf index 26b82e9..88ee113 100644 --- a/samples/cloudbroker/data_account_list/main.tf +++ b/samples/cloudbroker/data_account_list/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_account_resource_consumption_list/main.tf b/samples/cloudbroker/data_account_resource_consumption_list/main.tf index d34a93c..7bb8e8f 100644 --- a/samples/cloudbroker/data_account_resource_consumption_list/main.tf +++ b/samples/cloudbroker/data_account_resource_consumption_list/main.tf @@ -16,11 +16,11 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://alpha.dev.decs.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = - oauth2_url = "https://sso-alpha.dev.decs.online" + oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true } diff --git a/samples/cloudbroker/data_account_rg_list/main.tf b/samples/cloudbroker/data_account_rg_list/main.tf index 3824e28..5544b0c 100644 --- a/samples/cloudbroker/data_account_rg_list/main.tf +++ b/samples/cloudbroker/data_account_rg_list/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_account_vins_list/main.tf b/samples/cloudbroker/data_account_vins_list/main.tf index 46a51d5..6cc6103 100644 --- a/samples/cloudbroker/data_account_vins_list/main.tf +++ b/samples/cloudbroker/data_account_vins_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_disk/main.tf b/samples/cloudbroker/data_disk/main.tf index 2e6c639..32ef443 100644 --- a/samples/cloudbroker/data_disk/main.tf +++ b/samples/cloudbroker/data_disk/main.tf @@ -17,7 +17,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_disk_list/main.tf b/samples/cloudbroker/data_disk_list/main.tf index 08ae340..370ac7c 100644 --- a/samples/cloudbroker/data_disk_list/main.tf +++ b/samples/cloudbroker/data_disk_list/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_extnet/main.tf b/samples/cloudbroker/data_extnet/main.tf index 7d04369..bc02ddc 100644 --- a/samples/cloudbroker/data_extnet/main.tf +++ b/samples/cloudbroker/data_extnet/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_extnet_default/main.tf b/samples/cloudbroker/data_extnet_default/main.tf index a0bb01b..67ac0d3 100644 --- a/samples/cloudbroker/data_extnet_default/main.tf +++ b/samples/cloudbroker/data_extnet_default/main.tf @@ -19,7 +19,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_extnet_list/main.tf b/samples/cloudbroker/data_extnet_list/main.tf index aa9c3cd..29f2eee 100644 --- a/samples/cloudbroker/data_extnet_list/main.tf +++ b/samples/cloudbroker/data_extnet_list/main.tf @@ -18,7 +18,7 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_extnet_static_route/main.tf b/samples/cloudbroker/data_extnet_static_route/main.tf index b929a5d..00f0fe3 100644 --- a/samples/cloudbroker/data_extnet_static_route/main.tf +++ b/samples/cloudbroker/data_extnet_static_route/main.tf @@ -19,9 +19,9 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://mr4.digitalenergy.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true diff --git a/samples/cloudbroker/data_extnet_static_route_list/main.tf b/samples/cloudbroker/data_extnet_static_route_list/main.tf index 7e67aee..09d2050 100644 --- a/samples/cloudbroker/data_extnet_static_route_list/main.tf +++ b/samples/cloudbroker/data_extnet_static_route_list/main.tf @@ -19,9 +19,9 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://mr4.digitalenergy.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true diff --git a/samples/cloudbroker/data_grid/main.tf b/samples/cloudbroker/data_grid/main.tf index 9986b89..35156f2 100644 --- a/samples/cloudbroker/data_grid/main.tf +++ b/samples/cloudbroker/data_grid/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_grid_list/main.tf b/samples/cloudbroker/data_grid_list/main.tf index 081bd99..74132bf 100644 --- a/samples/cloudbroker/data_grid_list/main.tf +++ b/samples/cloudbroker/data_grid_list/main.tf @@ -19,7 +19,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_image/main.tf b/samples/cloudbroker/data_image/main.tf index 5fea3e1..1220bb0 100644 --- a/samples/cloudbroker/data_image/main.tf +++ b/samples/cloudbroker/data_image/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_image_list/main.tf b/samples/cloudbroker/data_image_list/main.tf index 7102950..c3efa0c 100644 --- a/samples/cloudbroker/data_image_list/main.tf +++ b/samples/cloudbroker/data_image_list/main.tf @@ -19,7 +19,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_image_list_stacks/main.tf b/samples/cloudbroker/data_image_list_stacks/main.tf index 41e7ed3..acc41db 100644 --- a/samples/cloudbroker/data_image_list_stacks/main.tf +++ b/samples/cloudbroker/data_image_list_stacks/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_pcidevice/main.tf b/samples/cloudbroker/data_pcidevice/main.tf index ab56434..4c2db39 100644 --- a/samples/cloudbroker/data_pcidevice/main.tf +++ b/samples/cloudbroker/data_pcidevice/main.tf @@ -19,13 +19,13 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true - } +} data "decort_cb_pcidevice" "pd" { diff --git a/samples/cloudbroker/data_pcidevice_list/main.tf b/samples/cloudbroker/data_pcidevice_list/main.tf index ce4e000..23e1902 100644 --- a/samples/cloudbroker/data_pcidevice_list/main.tf +++ b/samples/cloudbroker/data_pcidevice_list/main.tf @@ -19,13 +19,13 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true - } +} data "decort_cb_pcidevice_list" "pdl" {} diff --git a/samples/cloudbroker/data_sep/main.tf b/samples/cloudbroker/data_sep/main.tf index f880f9c..22b2ddd 100644 --- a/samples/cloudbroker/data_sep/main.tf +++ b/samples/cloudbroker/data_sep/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_sep_config/main.tf b/samples/cloudbroker/data_sep_config/main.tf index e19ed3a..8b5c15c 100644 --- a/samples/cloudbroker/data_sep_config/main.tf +++ b/samples/cloudbroker/data_sep_config/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_sep_consumption/main.tf b/samples/cloudbroker/data_sep_consumption/main.tf index c8790db..fe4e455 100644 --- a/samples/cloudbroker/data_sep_consumption/main.tf +++ b/samples/cloudbroker/data_sep_consumption/main.tf @@ -17,7 +17,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_sep_disk_list/main.tf b/samples/cloudbroker/data_sep_disk_list/main.tf index 319e08c..7749efe 100644 --- a/samples/cloudbroker/data_sep_disk_list/main.tf +++ b/samples/cloudbroker/data_sep_disk_list/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_sep_list/main.tf b/samples/cloudbroker/data_sep_list/main.tf index 9e11621..f2bfa47 100644 --- a/samples/cloudbroker/data_sep_list/main.tf +++ b/samples/cloudbroker/data_sep_list/main.tf @@ -16,7 +16,7 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/data_sep_pool/main.tf b/samples/cloudbroker/data_sep_pool/main.tf index 53e6983..44dcf8d 100644 --- a/samples/cloudbroker/data_sep_pool/main.tf +++ b/samples/cloudbroker/data_sep_pool/main.tf @@ -18,7 +18,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/resource_account/main.tf b/samples/cloudbroker/resource_account/main.tf index 21874c9..e08fe7d 100644 --- a/samples/cloudbroker/resource_account/main.tf +++ b/samples/cloudbroker/resource_account/main.tf @@ -22,7 +22,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/resource_delete_images/main.tf b/samples/cloudbroker/resource_delete_images/main.tf index d210197..be9b61d 100644 --- a/samples/cloudbroker/resource_delete_images/main.tf +++ b/samples/cloudbroker/resource_delete_images/main.tf @@ -20,7 +20,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/resource_disk/main.tf b/samples/cloudbroker/resource_disk/main.tf index 344550b..b736b64 100644 --- a/samples/cloudbroker/resource_disk/main.tf +++ b/samples/cloudbroker/resource_disk/main.tf @@ -17,20 +17,18 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true } - resource "decort_disk" "acl" { account_id = 88366 gid = 212 disk_name = "super-disk-re" size_max = 20 - restore = true permanently = true reason = "delete" iotune { diff --git a/samples/cloudbroker/resource_extnet/main.tf b/samples/cloudbroker/resource_extnet/main.tf index 95baf3c..cff2571 100644 --- a/samples/cloudbroker/resource_extnet/main.tf +++ b/samples/cloudbroker/resource_extnet/main.tf @@ -17,7 +17,7 @@ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/resource_extnet_static_route/main.tf b/samples/cloudbroker/resource_extnet_static_route/main.tf index 289eb45..bc67cbb 100644 --- a/samples/cloudbroker/resource_extnet_static_route/main.tf +++ b/samples/cloudbroker/resource_extnet_static_route/main.tf @@ -25,9 +25,9 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = - controller_url = "https://mr4.digitalenergy.online" + controller_url = "https://ds1.digitalenergy.online" #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true diff --git a/samples/cloudbroker/resource_image/main.tf b/samples/cloudbroker/resource_image/main.tf index 8d4379e..a478bd1 100644 --- a/samples/cloudbroker/resource_image/main.tf +++ b/samples/cloudbroker/resource_image/main.tf @@ -23,7 +23,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/resource_image_cdrom/main.tf b/samples/cloudbroker/resource_image_cdrom/main.tf index 8d9a83b..9f2a15c 100644 --- a/samples/cloudbroker/resource_image_cdrom/main.tf +++ b/samples/cloudbroker/resource_image_cdrom/main.tf @@ -22,7 +22,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/resource_pcidevice/main.tf b/samples/cloudbroker/resource_pcidevice/main.tf index dcebc72..083a91b 100644 --- a/samples/cloudbroker/resource_pcidevice/main.tf +++ b/samples/cloudbroker/resource_pcidevice/main.tf @@ -23,10 +23,9 @@ terraform { provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" - #oauth2_url = oauth2_url = "https://sso.digitalenergy.online" allow_unverified_ssl = true diff --git a/samples/cloudbroker/resource_sep/main.tf b/samples/cloudbroker/resource_sep/main.tf index 0cf5554..ea97c07 100644 --- a/samples/cloudbroker/resource_sep/main.tf +++ b/samples/cloudbroker/resource_sep/main.tf @@ -22,7 +22,7 @@ terraform { } */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/resource_sep_config/main.tf b/samples/cloudbroker/resource_sep_config/main.tf index 110dcaa..c5a3a31 100644 --- a/samples/cloudbroker/resource_sep_config/main.tf +++ b/samples/cloudbroker/resource_sep_config/main.tf @@ -21,7 +21,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url = diff --git a/samples/cloudbroker/resource_virtual_image/main.tf b/samples/cloudbroker/resource_virtual_image/main.tf index 481152b..0d07316 100644 --- a/samples/cloudbroker/resource_virtual_image/main.tf +++ b/samples/cloudbroker/resource_virtual_image/main.tf @@ -22,7 +22,7 @@ terraform { */ provider "decort" { - authenticator = "oauth2" + authenticator = "decs3o" #controller_url = controller_url = "https://ds1.digitalenergy.online" #oauth2_url =