From e99a30c855cb8142d325522e01fc91c0eca34fbe Mon Sep 17 00:00:00 2001 From: Roberto Jung Drebes Date: Sat, 16 Nov 2019 13:52:13 +0100 Subject: [PATCH 1/2] device approval/corp owned in acess level --- products/accesscontextmanager/api.yaml | 8 ++++++++ ...source_access_context_manager_access_level_test.go.erb | 2 ++ 2 files changed, 10 insertions(+) diff --git a/products/accesscontextmanager/api.yaml b/products/accesscontextmanager/api.yaml index f763276b18bd..c4aff80a8409 100644 --- 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 index 5601c341a923..f4e94949c27c 100644 --- 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" } From 00c34747eba1aa2346d954573fe61de71cab13d6 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Mon, 18 Nov 2019 18:36:11 +0000 Subject: [PATCH 2/2] Update tracked submodules -> HEAD on Mon Nov 18 18:36:11 UTC 2019 Tracked submodules are build/terraform-beta build/terraform-mapper build/terraform build/ansible build/inspec. --- build/terraform | 2 +- build/terraform-beta | 2 +- build/terraform-mapper | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/terraform b/build/terraform index b69bcdd0c493..2a828f44e9a5 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit b69bcdd0c493e76c4f44db501ce3bfa39ea647b5 +Subproject commit 2a828f44e9a5ce5a95223ff295e1d5b739819144 diff --git a/build/terraform-beta b/build/terraform-beta index c4885271ec54..9b2712f9cf58 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit c4885271ec54120e1f991d6f2ad5d3b005d7a1f0 +Subproject commit 9b2712f9cf58ebf6f38b1ab9beac863f586d9252 diff --git a/build/terraform-mapper b/build/terraform-mapper index d0e4cb1a9a19..79c12621e6da 160000 --- a/build/terraform-mapper +++ b/build/terraform-mapper @@ -1 +1 @@ -Subproject commit d0e4cb1a9a194873d0f0d3c8ec207f48bdafc74a +Subproject commit 79c12621e6da0dc911a5aedd4e5584ed99b6f818