Skip to content

Commit adf0122

Browse files
author
hc-github-team-tf-azure
committed
Updating based on ddd5dee0d
1 parent 1f9bc1c commit adf0122

File tree

7 files changed

+31
-77
lines changed

7 files changed

+31
-77
lines changed

resource-manager/network/2024-05-01/networkmanagereffectiveconnectivityconfiguration/constants.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,8 @@ func parseIsGlobal(input string) (*IsGlobal, error) {
217217
type ProvisioningState string
218218

219219
const (
220+
ProvisioningStateCanceled ProvisioningState = "Canceled"
221+
ProvisioningStateCreating ProvisioningState = "Creating"
220222
ProvisioningStateDeleting ProvisioningState = "Deleting"
221223
ProvisioningStateFailed ProvisioningState = "Failed"
222224
ProvisioningStateSucceeded ProvisioningState = "Succeeded"
@@ -225,6 +227,8 @@ const (
225227

226228
func PossibleValuesForProvisioningState() []string {
227229
return []string{
230+
string(ProvisioningStateCanceled),
231+
string(ProvisioningStateCreating),
228232
string(ProvisioningStateDeleting),
229233
string(ProvisioningStateFailed),
230234
string(ProvisioningStateSucceeded),
@@ -247,6 +251,8 @@ func (s *ProvisioningState) UnmarshalJSON(bytes []byte) error {
247251

248252
func parseProvisioningState(input string) (*ProvisioningState, error) {
249253
vals := map[string]ProvisioningState{
254+
"canceled": ProvisioningStateCanceled,
255+
"creating": ProvisioningStateCreating,
250256
"deleting": ProvisioningStateDeleting,
251257
"failed": ProvisioningStateFailed,
252258
"succeeded": ProvisioningStateSucceeded,

resource-manager/network/2024-05-01/networkmanagereffectivesecurityadminrules/constants.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ func parseGroupMemberType(input string) (*GroupMemberType, error) {
138138
type ProvisioningState string
139139

140140
const (
141+
ProvisioningStateCanceled ProvisioningState = "Canceled"
142+
ProvisioningStateCreating ProvisioningState = "Creating"
141143
ProvisioningStateDeleting ProvisioningState = "Deleting"
142144
ProvisioningStateFailed ProvisioningState = "Failed"
143145
ProvisioningStateSucceeded ProvisioningState = "Succeeded"
@@ -146,6 +148,8 @@ const (
146148

147149
func PossibleValuesForProvisioningState() []string {
148150
return []string{
151+
string(ProvisioningStateCanceled),
152+
string(ProvisioningStateCreating),
149153
string(ProvisioningStateDeleting),
150154
string(ProvisioningStateFailed),
151155
string(ProvisioningStateSucceeded),
@@ -168,6 +172,8 @@ func (s *ProvisioningState) UnmarshalJSON(bytes []byte) error {
168172

169173
func parseProvisioningState(input string) (*ProvisioningState, error) {
170174
vals := map[string]ProvisioningState{
175+
"canceled": ProvisioningStateCanceled,
176+
"creating": ProvisioningStateCreating,
171177
"deleting": ProvisioningStateDeleting,
172178
"failed": ProvisioningStateFailed,
173179
"succeeded": ProvisioningStateSucceeded,

resource-manager/sql/2023-08-01-preview/jobagents/constants.go

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -9,53 +9,6 @@ import (
99
// Copyright (c) Microsoft Corporation. All rights reserved.
1010
// Licensed under the MIT License. See NOTICE.txt in the project root for license information.
1111

12-
type JobAgentIdentityType string
13-
14-
const (
15-
JobAgentIdentityTypeNone JobAgentIdentityType = "None"
16-
JobAgentIdentityTypeSystemAssigned JobAgentIdentityType = "SystemAssigned"
17-
JobAgentIdentityTypeSystemAssignedUserAssigned JobAgentIdentityType = "SystemAssignedUserAssigned"
18-
JobAgentIdentityTypeUserAssigned JobAgentIdentityType = "UserAssigned"
19-
)
20-
21-
func PossibleValuesForJobAgentIdentityType() []string {
22-
return []string{
23-
string(JobAgentIdentityTypeNone),
24-
string(JobAgentIdentityTypeSystemAssigned),
25-
string(JobAgentIdentityTypeSystemAssignedUserAssigned),
26-
string(JobAgentIdentityTypeUserAssigned),
27-
}
28-
}
29-
30-
func (s *JobAgentIdentityType) UnmarshalJSON(bytes []byte) error {
31-
var decoded string
32-
if err := json.Unmarshal(bytes, &decoded); err != nil {
33-
return fmt.Errorf("unmarshaling: %+v", err)
34-
}
35-
out, err := parseJobAgentIdentityType(decoded)
36-
if err != nil {
37-
return fmt.Errorf("parsing %q: %+v", decoded, err)
38-
}
39-
*s = *out
40-
return nil
41-
}
42-
43-
func parseJobAgentIdentityType(input string) (*JobAgentIdentityType, error) {
44-
vals := map[string]JobAgentIdentityType{
45-
"none": JobAgentIdentityTypeNone,
46-
"systemassigned": JobAgentIdentityTypeSystemAssigned,
47-
"systemassigneduserassigned": JobAgentIdentityTypeSystemAssignedUserAssigned,
48-
"userassigned": JobAgentIdentityTypeUserAssigned,
49-
}
50-
if v, ok := vals[strings.ToLower(input)]; ok {
51-
return &v, nil
52-
}
53-
54-
// otherwise presume it's an undefined value and best-effort it
55-
out := JobAgentIdentityType(input)
56-
return &out, nil
57-
}
58-
5912
type JobAgentState string
6013

6114
const (
Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
package jobagents
22

3+
import (
4+
"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
5+
)
6+
37
// Copyright (c) Microsoft Corporation. All rights reserved.
48
// Licensed under the MIT License. See NOTICE.txt in the project root for license information.
59

610
type JobAgent struct {
7-
Id *string `json:"id,omitempty"`
8-
Identity *JobAgentIdentity `json:"identity,omitempty"`
9-
Location string `json:"location"`
10-
Name *string `json:"name,omitempty"`
11-
Properties *JobAgentProperties `json:"properties,omitempty"`
12-
Sku *Sku `json:"sku,omitempty"`
13-
Tags *map[string]string `json:"tags,omitempty"`
14-
Type *string `json:"type,omitempty"`
11+
Id *string `json:"id,omitempty"`
12+
Identity *identity.UserAssignedMap `json:"identity,omitempty"`
13+
Location string `json:"location"`
14+
Name *string `json:"name,omitempty"`
15+
Properties *JobAgentProperties `json:"properties,omitempty"`
16+
Sku *Sku `json:"sku,omitempty"`
17+
Tags *map[string]string `json:"tags,omitempty"`
18+
Type *string `json:"type,omitempty"`
1519
}

resource-manager/sql/2023-08-01-preview/jobagents/model_jobagentidentity.go

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package jobagents
22

3+
import (
4+
"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
5+
)
6+
37
// Copyright (c) Microsoft Corporation. All rights reserved.
48
// Licensed under the MIT License. See NOTICE.txt in the project root for license information.
59

610
type JobAgentUpdate struct {
7-
Identity *JobAgentIdentity `json:"identity,omitempty"`
8-
Sku *Sku `json:"sku,omitempty"`
9-
Tags *map[string]string `json:"tags,omitempty"`
11+
Identity *identity.UserAssignedMap `json:"identity,omitempty"`
12+
Sku *Sku `json:"sku,omitempty"`
13+
Tags *map[string]string `json:"tags,omitempty"`
1014
}

resource-manager/sql/2023-08-01-preview/jobagents/model_jobagentuserassignedidentity.go

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)