Skip to content

Commit 16a2ae2

Browse files
modular-magicianmodular-magician
authored
Upgrade dcl (#7012) (#13340)
* Upgrade dcl * Add new basic test * Simplify tests * Fix yaml * Use other zone * Update tests * Simplify tests * Remove sample tests, use handwritten * Rename test * Test in separate project, add back docs-only sample * Add test changes too * Add a couple fields Signed-off-by: Modular Magician <[email protected]> Signed-off-by: Modular Magician <[email protected]>
1 parent 1eaf83c commit 16a2ae2

7 files changed

+263
-2041
lines changed

‎.changelog/7012.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
osconfig: added support for `skip_await_rollout` in `google_os_config_os_policy_assignment`
3+
```

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ go 1.18
33

44
require (
55
cloud.google.com/go/bigtable v1.17.0
6-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.28.0
6+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.30.0
77
github.com/apparentlymart/go-cidr v1.1.0
88
github.com/client9/misspell v0.3.4
99
github.com/davecgh/go-spew v1.1.1

‎go.sum

+6
Original file line numberDiff line numberDiff line change
@@ -1289,3 +1289,9 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
12891289
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12901290
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
12911291
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
1292+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.29.0 h1:RmGDbvUWkRLYyWngSad04GR4LAnqflbXvzI1iBO2+rU=
1293+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.29.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
1294+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.29.1-0.20221217025133-b2d522d3684b h1:RgZjFUQKRCJV61R5emEFGhDOX84D0BPZG+p/E0hilSk=
1295+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.29.1-0.20221217025133-b2d522d3684b/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
1296+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.30.0 h1:1DMSUzQO2osKXy03/xZmr5n8bMlW3RyMhHR2JpkkVzY=
1297+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.30.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=

‎google/resource_os_config_os_policy_assignment.go

+53-28
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ func resourceOsConfigOsPolicyAssignment() *schema.Resource {
9797
Description: "The project for the resource",
9898
},
9999

100+
"skip_await_rollout": {
101+
Type: schema.TypeBool,
102+
Optional: true,
103+
Description: "Set to true to skip awaiting rollout during resource creation and update.",
104+
},
105+
100106
"baseline": {
101107
Type: schema.TypeBool,
102108
Computed: true,
@@ -1316,13 +1322,14 @@ func resourceOsConfigOsPolicyAssignmentCreate(d *schema.ResourceData, meta inter
13161322
}
13171323

13181324
obj := &osconfig.OSPolicyAssignment{
1319-
InstanceFilter: expandOsConfigOsPolicyAssignmentInstanceFilter(d.Get("instance_filter")),
1320-
Location: dcl.String(d.Get("location").(string)),
1321-
Name: dcl.String(d.Get("name").(string)),
1322-
OSPolicies: expandOsConfigOsPolicyAssignmentOSPoliciesArray(d.Get("os_policies")),
1323-
Rollout: expandOsConfigOsPolicyAssignmentRollout(d.Get("rollout")),
1324-
Description: dcl.String(d.Get("description").(string)),
1325-
Project: dcl.String(project),
1325+
InstanceFilter: expandOsConfigOsPolicyAssignmentInstanceFilter(d.Get("instance_filter")),
1326+
Location: dcl.String(d.Get("location").(string)),
1327+
Name: dcl.String(d.Get("name").(string)),
1328+
OSPolicies: expandOsConfigOsPolicyAssignmentOSPoliciesArray(d.Get("os_policies")),
1329+
Rollout: expandOsConfigOsPolicyAssignmentRollout(d.Get("rollout")),
1330+
Description: dcl.String(d.Get("description").(string)),
1331+
Project: dcl.String(project),
1332+
SkipAwaitRollout: dcl.Bool(d.Get("skip_await_rollout").(bool)),
13261333
}
13271334

13281335
id, err := obj.ID()
@@ -1370,13 +1377,14 @@ func resourceOsConfigOsPolicyAssignmentRead(d *schema.ResourceData, meta interfa
13701377
}
13711378

13721379
obj := &osconfig.OSPolicyAssignment{
1373-
InstanceFilter: expandOsConfigOsPolicyAssignmentInstanceFilter(d.Get("instance_filter")),
1374-
Location: dcl.String(d.Get("location").(string)),
1375-
Name: dcl.String(d.Get("name").(string)),
1376-
OSPolicies: expandOsConfigOsPolicyAssignmentOSPoliciesArray(d.Get("os_policies")),
1377-
Rollout: expandOsConfigOsPolicyAssignmentRollout(d.Get("rollout")),
1378-
Description: dcl.String(d.Get("description").(string)),
1379-
Project: dcl.String(project),
1380+
InstanceFilter: expandOsConfigOsPolicyAssignmentInstanceFilter(d.Get("instance_filter")),
1381+
Location: dcl.String(d.Get("location").(string)),
1382+
Name: dcl.String(d.Get("name").(string)),
1383+
OSPolicies: expandOsConfigOsPolicyAssignmentOSPoliciesArray(d.Get("os_policies")),
1384+
Rollout: expandOsConfigOsPolicyAssignmentRollout(d.Get("rollout")),
1385+
Description: dcl.String(d.Get("description").(string)),
1386+
Project: dcl.String(project),
1387+
SkipAwaitRollout: dcl.Bool(d.Get("skip_await_rollout").(bool)),
13801388
}
13811389

13821390
userAgent, err := generateUserAgentString(d, config.userAgent)
@@ -1422,6 +1430,9 @@ func resourceOsConfigOsPolicyAssignmentRead(d *schema.ResourceData, meta interfa
14221430
if err = d.Set("project", res.Project); err != nil {
14231431
return fmt.Errorf("error setting project in state: %s", err)
14241432
}
1433+
if err = d.Set("skip_await_rollout", res.SkipAwaitRollout); err != nil {
1434+
return fmt.Errorf("error setting skip_await_rollout in state: %s", err)
1435+
}
14251436
if err = d.Set("baseline", res.Baseline); err != nil {
14261437
return fmt.Errorf("error setting baseline in state: %s", err)
14271438
}
@@ -1457,15 +1468,28 @@ func resourceOsConfigOsPolicyAssignmentUpdate(d *schema.ResourceData, meta inter
14571468
}
14581469

14591470
obj := &osconfig.OSPolicyAssignment{
1460-
InstanceFilter: expandOsConfigOsPolicyAssignmentInstanceFilter(d.Get("instance_filter")),
1461-
Location: dcl.String(d.Get("location").(string)),
1462-
Name: dcl.String(d.Get("name").(string)),
1463-
OSPolicies: expandOsConfigOsPolicyAssignmentOSPoliciesArray(d.Get("os_policies")),
1464-
Rollout: expandOsConfigOsPolicyAssignmentRollout(d.Get("rollout")),
1465-
Description: dcl.String(d.Get("description").(string)),
1466-
Project: dcl.String(project),
1471+
InstanceFilter: expandOsConfigOsPolicyAssignmentInstanceFilter(d.Get("instance_filter")),
1472+
Location: dcl.String(d.Get("location").(string)),
1473+
Name: dcl.String(d.Get("name").(string)),
1474+
OSPolicies: expandOsConfigOsPolicyAssignmentOSPoliciesArray(d.Get("os_policies")),
1475+
Rollout: expandOsConfigOsPolicyAssignmentRollout(d.Get("rollout")),
1476+
Description: dcl.String(d.Get("description").(string)),
1477+
Project: dcl.String(project),
1478+
SkipAwaitRollout: dcl.Bool(d.Get("skip_await_rollout").(bool)),
1479+
}
1480+
// Construct state hint from old values
1481+
old := &osconfig.OSPolicyAssignment{
1482+
InstanceFilter: expandOsConfigOsPolicyAssignmentInstanceFilter(oldValue(d.GetChange("instance_filter"))),
1483+
Location: dcl.String(oldValue(d.GetChange("location")).(string)),
1484+
Name: dcl.String(oldValue(d.GetChange("name")).(string)),
1485+
OSPolicies: expandOsConfigOsPolicyAssignmentOSPoliciesArray(oldValue(d.GetChange("os_policies"))),
1486+
Rollout: expandOsConfigOsPolicyAssignmentRollout(oldValue(d.GetChange("rollout"))),
1487+
Description: dcl.String(oldValue(d.GetChange("description")).(string)),
1488+
Project: dcl.StringOrNil(oldValue(d.GetChange("project")).(string)),
1489+
SkipAwaitRollout: dcl.Bool(oldValue(d.GetChange("skip_await_rollout")).(bool)),
14671490
}
14681491
directive := UpdateDirective
1492+
directive = append(directive, dcl.WithStateHint(old))
14691493
userAgent, err := generateUserAgentString(d, config.userAgent)
14701494
if err != nil {
14711495
return err
@@ -1506,13 +1530,14 @@ func resourceOsConfigOsPolicyAssignmentDelete(d *schema.ResourceData, meta inter
15061530
}
15071531

15081532
obj := &osconfig.OSPolicyAssignment{
1509-
InstanceFilter: expandOsConfigOsPolicyAssignmentInstanceFilter(d.Get("instance_filter")),
1510-
Location: dcl.String(d.Get("location").(string)),
1511-
Name: dcl.String(d.Get("name").(string)),
1512-
OSPolicies: expandOsConfigOsPolicyAssignmentOSPoliciesArray(d.Get("os_policies")),
1513-
Rollout: expandOsConfigOsPolicyAssignmentRollout(d.Get("rollout")),
1514-
Description: dcl.String(d.Get("description").(string)),
1515-
Project: dcl.String(project),
1533+
InstanceFilter: expandOsConfigOsPolicyAssignmentInstanceFilter(d.Get("instance_filter")),
1534+
Location: dcl.String(d.Get("location").(string)),
1535+
Name: dcl.String(d.Get("name").(string)),
1536+
OSPolicies: expandOsConfigOsPolicyAssignmentOSPoliciesArray(d.Get("os_policies")),
1537+
Rollout: expandOsConfigOsPolicyAssignmentRollout(d.Get("rollout")),
1538+
Description: dcl.String(d.Get("description").(string)),
1539+
Project: dcl.String(project),
1540+
SkipAwaitRollout: dcl.Bool(d.Get("skip_await_rollout").(bool)),
15161541
}
15171542

15181543
log.Printf("[DEBUG] Deleting OSPolicyAssignment %q", d.Id())

0 commit comments

Comments
 (0)