Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support the os_version_extra field in posture checks and devices schema #3281

Merged
merged 1 commit into from
May 6, 2024

Conversation

da-cf
Copy link
Contributor

@da-cf da-cf commented May 2, 2024

Add support for the existing os_version_extra field that has been in production for a while:

@da-cf da-cf requested a review from jacobbednarz as a code owner May 2, 2024 01:05
Copy link
Contributor

github-actions bot commented May 2, 2024

changelog detected ✅

@jacobbednarz
Copy link
Member

looks like the acceptance tests are failing on this one

TF_ACC=1 go test ./internal/sdkv2provider -v -run "^TestAccCloudflareDevicePostureRule_" -count 1 -timeout 120m -parallel 1
=== RUN   TestAccCloudflareDevicePostureRule_SerialNumber
--- PASS: TestAccCloudflareDevicePostureRule_SerialNumber (11.75s)
=== RUN   TestAccCloudflareDevicePostureRule_OsVersion
--- PASS: TestAccCloudflareDevicePostureRule_OsVersion (9.35s)
=== RUN   TestAccCloudflareDevicePostureRule_OsVersionExtra
    resource_cloudflare_device_posture_rule_test.go:93: Step 1/1 error: Check failed: Check 8/8 error: cloudflare_device_posture_rule.olmrjtnmuv: Attribute 'input.0.os_version_extra' expected "(a)", got ""
--- FAIL: TestAccCloudflareDevicePostureRule_OsVersionExtra (6.95s)
=== RUN   TestAccCloudflareDevicePostureRule_LinuxOsDistro
--- PASS: TestAccCloudflareDevicePostureRule_LinuxOsDistro (9.74s)
=== RUN   TestAccCloudflareDevicePostureRule_DomainJoined
--- PASS: TestAccCloudflareDevicePostureRule_DomainJoined (8.96s)
=== RUN   TestAccCloudflareDevicePostureRule_Firewall
--- PASS: TestAccCloudflareDevicePostureRule_Firewall (9.70s)
=== RUN   TestAccCloudflareDevicePostureRule_DiskEncryption_RequireAll
--- PASS: TestAccCloudflareDevicePostureRule_DiskEncryption_RequireAll (9.24s)
=== RUN   TestAccCloudflareDevicePostureRule_DiskEncryption_CheckDisks
--- PASS: TestAccCloudflareDevicePostureRule_DiskEncryption_CheckDisks (9.28s)
FAIL
FAIL	github.com/cloudflare/terraform-provider-cloudflare/internal/sdkv2provider	76.457s
FAIL
make: *** [testacc] Error 1

@da-cf
Copy link
Contributor Author

da-cf commented May 6, 2024

Thanks for catching this. Acceptance tests are now passing!

@jacobbednarz
Copy link
Member

solid, thanks!

TF_ACC=1 go test ./internal/sdkv2provider -v -run "^TestAccCloudflareDevicePostureRule_" -count 1 -timeout 120m -parallel 1
=== RUN   TestAccCloudflareDevicePostureRule_SerialNumber
--- PASS: TestAccCloudflareDevicePostureRule_SerialNumber (11.28s)
=== RUN   TestAccCloudflareDevicePostureRule_OsVersion
--- PASS: TestAccCloudflareDevicePostureRule_OsVersion (10.38s)
=== RUN   TestAccCloudflareDevicePostureRule_OsVersionExtra
--- PASS: TestAccCloudflareDevicePostureRule_OsVersionExtra (10.52s)
=== RUN   TestAccCloudflareDevicePostureRule_LinuxOsDistro
--- PASS: TestAccCloudflareDevicePostureRule_LinuxOsDistro (9.45s)
=== RUN   TestAccCloudflareDevicePostureRule_DomainJoined
--- PASS: TestAccCloudflareDevicePostureRule_DomainJoined (10.24s)
=== RUN   TestAccCloudflareDevicePostureRule_Firewall
--- PASS: TestAccCloudflareDevicePostureRule_Firewall (9.58s)
=== RUN   TestAccCloudflareDevicePostureRule_DiskEncryption_RequireAll
--- PASS: TestAccCloudflareDevicePostureRule_DiskEncryption_RequireAll (9.78s)
=== RUN   TestAccCloudflareDevicePostureRule_DiskEncryption_CheckDisks
--- PASS: TestAccCloudflareDevicePostureRule_DiskEncryption_CheckDisks (9.89s)
PASS
ok  	github.com/cloudflare/terraform-provider-cloudflare/internal/sdkv2provider	82.333s

@jacobbednarz jacobbednarz merged commit 44220d2 into cloudflare:master May 6, 2024
9 checks passed
@github-actions github-actions bot added this to the v4.32.0 milestone May 6, 2024
github-actions bot pushed a commit that referenced this pull request May 6, 2024
Copy link
Contributor

github-actions bot commented May 8, 2024

This functionality has been released in v4.32.0 of the Terraform Cloudflare Provider.

Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants