Skip to content

Commit 4139bd7

Browse files
avivm-langavivm-lang
committed
fixes
1 parent d229d83 commit 4139bd7

7 files changed

Lines changed: 47 additions & 23 deletions

‎akeyless/common/utils.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,14 @@ func ExpandStringList(configured []interface{}) []string {
7575
return vs
7676
}
7777

78+
func ExpandStringMap(raw map[string]interface{}) map[string]string {
79+
out := make(map[string]string, len(raw))
80+
for k, v := range raw {
81+
out[k] = v.(string)
82+
}
83+
return out
84+
}
85+
7886
func ErrorDiagnostics(message string) diag.Diagnostic {
7987
return diag.Diagnostic{
8088
Severity: diag.Error,

‎akeyless/resource_mcp_secret_bearer_token.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func resourceMcpSecretBearerTokenCreate(d *schema.ResourceData, m interface{}) e
122122
}
123123

124124
d.SetId(name)
125-
return resourceMcpSecretBearerTokenRead(d, m)
125+
return nil
126126
}
127127

128128
func resourceMcpSecretBearerTokenRead(d *schema.ResourceData, m interface{}) error {
@@ -169,5 +169,6 @@ func resourceMcpSecretBearerTokenUpdate(d *schema.ResourceData, m interface{}) e
169169
if err := updateMcpSecretItemMeta(d, m); err != nil {
170170
return err
171171
}
172-
return resourceMcpSecretBearerTokenRead(d, m)
172+
d.SetId(name)
173+
return nil
173174
}

‎akeyless/resource_mcp_secret_common.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ func readMcpSecretValue(d *schema.ResourceData, m interface{}) (*mcpSecretAuthCo
6060
Name: path,
6161
Token: &token,
6262
}
63-
itemOut, _, err := client.DescribeItem(ctx).Body(item).Execute()
63+
itemOut, res, err := client.DescribeItem(ctx).Body(item).Execute()
6464
if err != nil {
65-
return nil, nil, err
65+
return nil, nil, common.HandleReadError(d, "can't describe MCP secret", res, err)
6666
}
6767

6868
value, ok := gsvOut[path]

‎akeyless/resource_mcp_secret_oauth_auth_code.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func resourceMcpSecretOAuthAuthCodeCreate(d *schema.ResourceData, m interface{})
154154
}
155155

156156
d.SetId(name)
157-
return resourceMcpSecretOAuthAuthCodeRead(d, m)
157+
return nil
158158
}
159159

160160
func resourceMcpSecretOAuthAuthCodeRead(d *schema.ResourceData, m interface{}) error {
@@ -209,5 +209,6 @@ func resourceMcpSecretOAuthAuthCodeUpdate(d *schema.ResourceData, m interface{})
209209
if err := updateMcpSecretItemMeta(d, m); err != nil {
210210
return err
211211
}
212-
return resourceMcpSecretOAuthAuthCodeRead(d, m)
212+
d.SetId(name)
213+
return nil
213214
}

‎akeyless/resource_mcp_secret_oauth_client_creds.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func resourceMcpSecretOAuthClientCredsCreate(d *schema.ResourceData, m interface
141141
}
142142

143143
d.SetId(name)
144-
return resourceMcpSecretOAuthClientCredsRead(d, m)
144+
return nil
145145
}
146146

147147
func resourceMcpSecretOAuthClientCredsRead(d *schema.ResourceData, m interface{}) error {
@@ -188,5 +188,6 @@ func resourceMcpSecretOAuthClientCredsUpdate(d *schema.ResourceData, m interface
188188
if err := updateMcpSecretItemMeta(d, m); err != nil {
189189
return err
190190
}
191-
return resourceMcpSecretOAuthClientCredsRead(d, m)
191+
d.SetId(name)
192+
return nil
192193
}

‎akeyless/resource_target_custom_dns.go‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,6 @@ func resourceCustomDnsTarget() *schema.Resource {
7070
}
7171
}
7272

73-
func expandStringMap(raw map[string]interface{}) map[string]string {
74-
out := make(map[string]string, len(raw))
75-
for k, v := range raw {
76-
out[k] = v.(string)
77-
}
78-
return out
79-
}
80-
8173
func resourceCustomDnsTargetCreate(d *schema.ResourceData, m interface{}) error {
8274
provider := m.(*providerMeta)
8375
client := *provider.client
@@ -89,7 +81,7 @@ func resourceCustomDnsTargetCreate(d *schema.ResourceData, m interface{}) error
8981
Name: name,
9082
Token: &token,
9183
ProviderType: d.Get("provider_type").(string),
92-
DnsParameter: expandStringMap(d.Get("dns_parameter").(map[string]interface{})),
84+
DnsParameter: common.ExpandStringMap(d.Get("dns_parameter").(map[string]interface{})),
9385
}
9486
common.GetAkeylessPtr(&body.Description, d.Get("description").(string))
9587
common.GetAkeylessPtr(&body.Key, d.Get("key").(string))
@@ -160,7 +152,7 @@ func resourceCustomDnsTargetUpdate(d *schema.ResourceData, m interface{}) error
160152
Name: name,
161153
Token: &token,
162154
ProviderType: d.Get("provider_type").(string),
163-
DnsParameter: expandStringMap(d.Get("dns_parameter").(map[string]interface{})),
155+
DnsParameter: common.ExpandStringMap(d.Get("dns_parameter").(map[string]interface{})),
164156
}
165157
common.GetAkeylessPtr(&body.Description, d.Get("description").(string))
166158
common.GetAkeylessPtr(&body.Key, d.Get("key").(string))

‎akeyless/tests/gateway/certificate_discovery_test.go‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ func TestCertificateDiscoveryResource(t *testing.T) {
1313

1414
name := "cert_discovery"
1515
folder := testPath(name)
16+
resourceName := fmt.Sprintf("akeyless_certificate_discovery.%v", name)
1617

1718
config := fmt.Sprintf(`
1819
resource "akeyless_certificate_discovery" "%v" {
@@ -23,17 +24,37 @@ func TestCertificateDiscoveryResource(t *testing.T) {
2324
}
2425
`, name, folder)
2526

27+
// All schema fields are ForceNew — "update" is destroy+recreate.
28+
configUpdate := fmt.Sprintf(`
29+
resource "akeyless_certificate_discovery" "%v" {
30+
hosts = "127.0.0.1"
31+
port_ranges = "8443"
32+
target_location = "%v"
33+
expiration_event_in = ["30", "10"]
34+
}
35+
`, name, folder)
36+
2637
resource.Test(t, resource.TestCase{
2738
ProviderFactories: providerFactories,
2839
Steps: []resource.TestStep{
2940
{
3041
Config: config,
3142
Check: resource.ComposeTestCheckFunc(
32-
resource.TestCheckResourceAttrSet(fmt.Sprintf("akeyless_certificate_discovery.%v", name), "id"),
33-
resource.TestCheckResourceAttr(fmt.Sprintf("akeyless_certificate_discovery.%v", name), "hosts", "127.0.0.1"),
34-
resource.TestCheckResourceAttr(fmt.Sprintf("akeyless_certificate_discovery.%v", name), "port_ranges", "443"),
35-
resource.TestCheckResourceAttr(fmt.Sprintf("akeyless_certificate_discovery.%v", name), "target_location", folder),
36-
resource.TestCheckResourceAttr(fmt.Sprintf("akeyless_certificate_discovery.%v", name), "expiration_event_in.#", "2"),
43+
resource.TestCheckResourceAttrSet(resourceName, "id"),
44+
resource.TestCheckResourceAttr(resourceName, "hosts", "127.0.0.1"),
45+
resource.TestCheckResourceAttr(resourceName, "port_ranges", "443"),
46+
resource.TestCheckResourceAttr(resourceName, "target_location", folder),
47+
resource.TestCheckResourceAttr(resourceName, "expiration_event_in.#", "2"),
48+
),
49+
},
50+
{
51+
Config: configUpdate,
52+
Check: resource.ComposeTestCheckFunc(
53+
resource.TestCheckResourceAttrSet(resourceName, "id"),
54+
resource.TestCheckResourceAttr(resourceName, "hosts", "127.0.0.1"),
55+
resource.TestCheckResourceAttr(resourceName, "port_ranges", "8443"),
56+
resource.TestCheckResourceAttr(resourceName, "target_location", folder),
57+
resource.TestCheckResourceAttr(resourceName, "expiration_event_in.#", "2"),
3758
),
3859
},
3960
},

0 commit comments

Comments
 (0)