Skip to content

Commit 7822f3d

Browse files
tombuildsstufftombuildsstuff
authored
Merge pull request hashicorp#14153 from hashicorp/pandora-relay-regen
relay - regenerate embedded sdk
2 parents 705a277 + a92f9d5 commit 7822f3d

File tree

59 files changed

+4304
-1426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+4304
-1426
lines changed

‎internal/services/relay/relay_hybrid_connection_authorization_rule_resource.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func resourceRelayHybridConnectionAuthorizationRule() *pluginsdk.Resource {
2323
Delete: resourceRelayHybridConnectionAuthorizationRuleDelete,
2424

2525
Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
26-
_, err := hybridconnections.ParseAuthorizationRuleID(id)
26+
_, err := hybridconnections.ParseHybridConnectionAuthorizationRuleID(id)
2727
return err
2828
}),
2929

@@ -69,7 +69,7 @@ func resourceRelayHybridConnectionAuthorizationRuleCreateUpdate(d *pluginsdk.Res
6969

7070
log.Printf("[INFO] preparing arguments for Relay HybridConnection Authorization Rule creation.")
7171

72-
resourceId := hybridconnections.NewAuthorizationRuleID(subscriptionId, d.Get("resource_group_name").(string), d.Get("namespace_name").(string), d.Get("hybrid_connection_name").(string), d.Get("name").(string))
72+
resourceId := hybridconnections.NewHybridConnectionAuthorizationRuleID(subscriptionId, d.Get("resource_group_name").(string), d.Get("namespace_name").(string), d.Get("hybrid_connection_name").(string), d.Get("name").(string))
7373
if d.IsNewResource() {
7474
existing, err := client.GetAuthorizationRule(ctx, resourceId)
7575
if err != nil {
@@ -83,7 +83,7 @@ func resourceRelayHybridConnectionAuthorizationRuleCreateUpdate(d *pluginsdk.Res
8383
}
8484

8585
parameters := hybridconnections.AuthorizationRule{
86-
Name: utils.String(resourceId.Name),
86+
Name: utils.String(resourceId.AuthorizationRuleName),
8787
Properties: hybridconnections.AuthorizationRuleProperties{
8888
Rights: expandHybridConnectionAuthorizationRuleRights(d),
8989
},
@@ -103,7 +103,7 @@ func resourceRelayHybridConnectionAuthorizationRuleRead(d *pluginsdk.ResourceDat
103103
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
104104
defer cancel()
105105

106-
id, err := hybridconnections.ParseAuthorizationRuleID(d.Id())
106+
id, err := hybridconnections.ParseHybridConnectionAuthorizationRuleID(d.Id())
107107
if err != nil {
108108
return err
109109
}
@@ -122,10 +122,10 @@ func resourceRelayHybridConnectionAuthorizationRuleRead(d *pluginsdk.ResourceDat
122122
return fmt.Errorf("listing keys for %s: %+v", id, err)
123123
}
124124

125-
d.Set("name", id.Name)
125+
d.Set("name", id.AuthorizationRuleName)
126126
d.Set("hybrid_connection_name", id.HybridConnectionName)
127127
d.Set("namespace_name", id.NamespaceName)
128-
d.Set("resource_group_name", id.ResourceGroup)
128+
d.Set("resource_group_name", id.ResourceGroupName)
129129

130130
if model := resp.Model; model != nil {
131131
listen, send, manage := flattenHybridConnectionAuthorizationRuleRights(model.Properties.Rights)
@@ -147,7 +147,7 @@ func resourceRelayHybridConnectionAuthorizationRuleDelete(d *pluginsdk.ResourceD
147147
ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
148148
defer cancel()
149149

150-
id, err := hybridconnections.ParseAuthorizationRuleID(d.Id())
150+
id, err := hybridconnections.ParseHybridConnectionAuthorizationRuleID(d.Id())
151151
if err != nil {
152152
return err
153153
}

‎internal/services/relay/relay_hybrid_connection_authorization_rule_resource_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func TestAccRelayHybridConnectionAuthorizationRule_requiresImport(t *testing.T)
5252
}
5353

5454
func (t RelayHybridConnectionAuthorizationRuleResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
55-
id, err := hybridconnections.ParseAuthorizationRuleID(state.ID)
55+
id, err := hybridconnections.ParseHybridConnectionAuthorizationRuleID(state.ID)
5656
if err != nil {
5757
return nil, err
5858
}

‎internal/services/relay/relay_hybrid_connection_resource.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func resourceArmRelayHybridConnectionCreateUpdate(d *pluginsdk.ResourceData, met
9999
}
100100

101101
if _, err := client.CreateOrUpdate(ctx, id, parameters); err != nil {
102-
return fmt.Errorf("creating/updating Hybrid Connection %q (Namespace %q Resource Group %q): %+v", id.Name, id.NamespaceName, id.ResourceGroup, err)
102+
return fmt.Errorf("creating/updating %s: %+v", id, err)
103103
}
104104

105105
d.SetId(id.ID())
@@ -126,9 +126,9 @@ func resourceArmRelayHybridConnectionRead(d *pluginsdk.ResourceData, meta interf
126126
return fmt.Errorf("retrieving %s: %+v", *id, err)
127127
}
128128

129-
d.Set("name", id.Name)
129+
d.Set("name", id.HybridConnectionName)
130130
d.Set("relay_namespace_name", id.NamespaceName)
131-
d.Set("resource_group_name", id.ResourceGroup)
131+
d.Set("resource_group_name", id.ResourceGroupName)
132132

133133
if model := resp.Model; model != nil {
134134
if props := model.Properties; props != nil {
@@ -151,7 +151,7 @@ func resourceArmRelayHybridConnectionDelete(d *pluginsdk.ResourceData, meta inte
151151
}
152152

153153
if _, err := client.Delete(ctx, *id); err != nil {
154-
return fmt.Errorf("deleting Hybrid Connection %q (Namespace %q / Resource Group %q): %+v", id.NamespaceName, id.NamespaceName, id.ResourceGroup, err)
154+
return fmt.Errorf("deleting %s: %+v", *id, err)
155155
}
156156

157157
// we can't make use of the Future here due to a bug where 404 isn't tracked as Successful

‎internal/services/relay/relay_namespace_authorization_rule_resource.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func resourceRelayNamespaceAuthorizationRuleCreateUpdate(d *pluginsdk.ResourceDa
7777
}
7878

7979
parameters := namespaces.AuthorizationRule{
80-
Name: utils.String(resourceId.Name),
80+
Name: utils.String(resourceId.AuthorizationRuleName),
8181
Properties: namespaces.AuthorizationRuleProperties{
8282
Rights: expandAuthorizationRuleRights(d),
8383
},
@@ -116,9 +116,9 @@ func resourceRelayNamespaceAuthorizationRuleRead(d *pluginsdk.ResourceData, meta
116116
return fmt.Errorf("listing keys for %s: %+v", id, err)
117117
}
118118

119-
d.Set("name", id.Name)
119+
d.Set("name", id.AuthorizationRuleName)
120120
d.Set("namespace_name", id.NamespaceName)
121-
d.Set("resource_group_name", id.ResourceGroup)
121+
d.Set("resource_group_name", id.ResourceGroupName)
122122

123123
if model := resp.Model; model != nil {
124124
listen, send, manage := flattenAuthorizationRuleRights(model.Properties.Rights)

‎internal/services/relay/relay_namespace_resource.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ func resourceRelayNamespaceRead(d *pluginsdk.ResourceData, meta interface{}) err
151151
return fmt.Errorf("retrieving %s: %+v", *id, err)
152152
}
153153

154-
authRuleId := namespaces.NewAuthorizationRuleID(id.SubscriptionId, id.ResourceGroup, id.Name, "RootManageSharedAccessKey")
154+
authRuleId := namespaces.NewAuthorizationRuleID(id.SubscriptionId, id.ResourceGroupName, id.NamespaceName, "RootManageSharedAccessKey")
155155
keysResp, err := client.ListKeys(ctx, authRuleId)
156156
if err != nil {
157157
return fmt.Errorf("listing keys for %s: %+v", *id, err)
158158
}
159159

160-
d.Set("name", id.Name)
161-
d.Set("resource_group_name", id.ResourceGroup)
160+
d.Set("name", id.NamespaceName)
161+
d.Set("resource_group_name", id.ResourceGroupName)
162162

163163
if model := resp.Model; model != nil {
164164
d.Set("location", location.Normalize(model.Location))
@@ -201,7 +201,7 @@ func resourceRelayNamespaceDelete(d *pluginsdk.ResourceData, meta interface{}) e
201201
}
202202

203203
// we can't make use of the Future here due to a bug where 404 isn't tracked as Successful
204-
log.Printf("[DEBUG] Waiting for Relay Namespace %q (Resource Group %q) to be deleted", id.Name, id.ResourceGroup)
204+
log.Printf("[DEBUG] Waiting for %s to be deleted", *id)
205205
stateConf := &pluginsdk.StateChangeConf{
206206
Pending: []string{"Pending"},
207207
Target: []string{"Deleted"},

‎internal/services/relay/sdk/2017-04-01/hybridconnections/constants.go

+46
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package hybridconnections
22

3+
import "strings"
4+
35
type AccessRights string
46

57
const (
@@ -8,9 +10,53 @@ const (
810
AccessRightsSend AccessRights = "Send"
911
)
1012

13+
func PossibleValuesForAccessRights() []string {
14+
return []string{
15+
string(AccessRightsListen),
16+
string(AccessRightsManage),
17+
string(AccessRightsSend),
18+
}
19+
}
20+
21+
func parseAccessRights(input string) (*AccessRights, error) {
22+
vals := map[string]AccessRights{
23+
"listen": AccessRightsListen,
24+
"manage": AccessRightsManage,
25+
"send": AccessRightsSend,
26+
}
27+
if v, ok := vals[strings.ToLower(input)]; ok {
28+
return &v, nil
29+
}
30+
31+
// otherwise presume it's an undefined value and best-effort it
32+
out := AccessRights(input)
33+
return &out, nil
34+
}
35+
1136
type KeyType string
1237

1338
const (
1439
KeyTypePrimaryKey KeyType = "PrimaryKey"
1540
KeyTypeSecondaryKey KeyType = "SecondaryKey"
1641
)
42+
43+
func PossibleValuesForKeyType() []string {
44+
return []string{
45+
string(KeyTypePrimaryKey),
46+
string(KeyTypeSecondaryKey),
47+
}
48+
}
49+
50+
func parseKeyType(input string) (*KeyType, error) {
51+
vals := map[string]KeyType{
52+
"primarykey": KeyTypePrimaryKey,
53+
"secondarykey": KeyTypeSecondaryKey,
54+
}
55+
if v, ok := vals[strings.ToLower(input)]; ok {
56+
return &v, nil
57+
}
58+
59+
// otherwise presume it's an undefined value and best-effort it
60+
out := KeyType(input)
61+
return &out, nil
62+
}

‎internal/services/relay/sdk/2017-04-01/hybridconnections/id_authorizationrule.go

-144
This file was deleted.

0 commit comments

Comments
 (0)