From bd641fb4444c7a60561f888310be1d17403dc474 Mon Sep 17 00:00:00 2001 From: Max Brain Date: Tue, 5 Sep 2023 13:34:59 +0300 Subject: [PATCH 1/2] Updates provider to use the default field instead of computing it Signed-off-by: Max Brain --- examples/provider/provider.tf | 5 ++++- examples/resources/aws_register/main.tf | 3 --- internal/ksoc/provider.go | 10 +++------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/examples/provider/provider.tf b/examples/provider/provider.tf index e31c54f..7e51d6f 100644 --- a/examples/provider/provider.tf +++ b/examples/provider/provider.tf @@ -1 +1,4 @@ -provider "ksoc" {} +provider "ksoc" { + access_key_id = "ksoc_access_key" + secret_key = "ksoc_secret_key" +} diff --git a/examples/resources/aws_register/main.tf b/examples/resources/aws_register/main.tf index 3fdd8ec..d18b4e4 100644 --- a/examples/resources/aws_register/main.tf +++ b/examples/resources/aws_register/main.tf @@ -1,7 +1,4 @@ resource "ksoc_aws_register" "this" { - ksoc_api_url = "" ksoc_assumed_role_arn = "arn:aws:iam:::role/ksoc-connector" - access_key_id = "ksoc_access_key" - secret_key = "ksoc_secret_key" aws_account_id = "aws_account_id" } diff --git a/internal/ksoc/provider.go b/internal/ksoc/provider.go index a60e78d..36e6b78 100644 --- a/internal/ksoc/provider.go +++ b/internal/ksoc/provider.go @@ -18,8 +18,9 @@ func New(version string) func() *schema.Provider { "ksoc_api_url": { Type: schema.TypeString, Description: "Ksoc API to target. Defaults to https://api.ksoc.com", - Computed: true, + Default: "https://api.ksoc.com", Required: false, + Computed: true, }, "access_key_id": { Type: schema.TypeString, @@ -53,13 +54,8 @@ type Config struct { } func configureProvider(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) { - ksocApiUrl := d.Get("ksoc_api_url").(string) - if ksocApiUrl == "" { - ksocApiUrl = "https://api.ksoc.com" - } - config := Config{ - KsocApiUrl: ksocApiUrl, + KsocApiUrl: d.Get("ksoc_api_url").(string), AccessKeyId: d.Get("access_key_id").(string), SecretKey: d.Get("secret_key").(string), } From 713a6b94691e954a116daf07b260e5b5ca98d871 Mon Sep 17 00:00:00 2001 From: Max Brain Date: Tue, 5 Sep 2023 13:40:01 +0300 Subject: [PATCH 2/2] Updates api field to use Optional Signed-off-by: Max Brain --- docs/index.md | 7 +++++-- examples/provider/provider.tf | 4 ++-- internal/ksoc/provider.go | 3 +-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/index.md b/docs/index.md index 88a3d9d..a929542 100644 --- a/docs/index.md +++ b/docs/index.md @@ -13,7 +13,10 @@ description: |- ## Example Usage ```terraform -provider "ksoc" {} +provider "ksoc" { + access_key_id = "ksoc_access_key" + secret_key = "ksoc_secret_key" +} ``` @@ -24,6 +27,6 @@ provider "ksoc" {} - `access_key_id` (String, Sensitive) Ksoc Customer Access ID - `secret_key` (String, Sensitive) Ksoc Customer Secret Key -### Read-Only +### Optional - `ksoc_api_url` (String) Ksoc API to target. Defaults to https://api.ksoc.com diff --git a/examples/provider/provider.tf b/examples/provider/provider.tf index 7e51d6f..ce38432 100644 --- a/examples/provider/provider.tf +++ b/examples/provider/provider.tf @@ -1,4 +1,4 @@ provider "ksoc" { - access_key_id = "ksoc_access_key" - secret_key = "ksoc_secret_key" + access_key_id = "ksoc_access_key" + secret_key = "ksoc_secret_key" } diff --git a/internal/ksoc/provider.go b/internal/ksoc/provider.go index 36e6b78..ef21c8a 100644 --- a/internal/ksoc/provider.go +++ b/internal/ksoc/provider.go @@ -19,8 +19,7 @@ func New(version string) func() *schema.Provider { Type: schema.TypeString, Description: "Ksoc API to target. Defaults to https://api.ksoc.com", Default: "https://api.ksoc.com", - Required: false, - Computed: true, + Optional: true, }, "access_key_id": { Type: schema.TypeString,