requireAdminApproval/requireCorpOwned in AccessLevel's devicePolicy (#…

…2710) Merged PR #2710.
GoogleCloudPlatform · Nov 18, 2019 · 8ef590c · 8ef590c
1 parent a5a6465
commit 8ef590c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/build/terraform-mapper b/build/terraform-mapper
diff --git a/products/accesscontextmanager/api.yaml b/products/accesscontextmanager/api.yaml
@@ -276,6 +276,14 @@ objects:
                           - :DESKTOP_WINDOWS
                           - :DESKTOP_LINUX
                           - :DESKTOP_CHROME_OS
+                  - !ruby/object:Api::Type::Boolean
+                    name: 'requireAdminApproval'
+                    description: |
+                      Whether the device needs to be approved by the customer admin.
+                  - !ruby/object:Api::Type::Boolean
+                    name: 'requireCorpOwned'
+                    description: |
+                      Whether the device needs to be corp owned.
   - !ruby/object:Api::Resource
     name: 'ServicePerimeter'
     # This is an unusual API, so we need to use a few fields to map the methods

diff --git a/third_party/terraform/tests/resource_access_context_manager_access_level_test.go.erb b/third_party/terraform/tests/resource_access_context_manager_access_level_test.go.erb
@@ -146,6 +146,8 @@ resource "google_access_context_manager_access_level" "test-access" {
       negate = false
       device_policy {
         require_screen_lock = false
+        require_admin_approval = false
+        require_corp_owned = true
         os_constraints {
           os_type = "DESKTOP_CHROME_OS"
         }
+22 −0		google/accesscontextmanager_access_level.go
+8 −0		google/self_link_helpers.go