From c9dac3bc75925a38c07bf85b61da53c45e640291 Mon Sep 17 00:00:00 2001 From: uc-build-user <116039615+uc-build-user@users.noreply.github.com> Date: Thu, 12 Sep 2024 19:03:50 -0400 Subject: [PATCH] Sync monorepo state at "update userclouds.com version to 1.6.0" (#61) Syncing from userclouds/userclouds@581f9436c0868e99dd2ca9b73c5edc950e9e754b --- e2e-test/lots-of-resources-modified.yaml | 22 +++++++++++++++++++ e2e-test/lots-of-resources.yaml | 28 ++++++++++++++++++++++++ go.mod | 6 +---- go.sum | 16 ++------------ internal/tfstate/tfstate_test.go | 8 +++---- 5 files changed, 57 insertions(+), 23 deletions(-) diff --git a/e2e-test/lots-of-resources-modified.yaml b/e2e-test/lots-of-resources-modified.yaml index 22a4855..f0965be 100644 --- a/e2e-test/lots-of-resources-modified.yaml +++ b/e2e-test/lots-of-resources-modified.yaml @@ -28,10 +28,13 @@ resources: __DEFAULT: 2c7a7c9b-90e8-47e4-8f6e-ec73bd2dec16 <>: 2c7a7c9b-90e8-47e4-8f6e-ec73bd2dec16 attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "string")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: none is_array: false name: email + table: users type: string - uc_terraform_type: userstore_column manifest_id: userstore_column_external_alias_renamed @@ -39,10 +42,13 @@ resources: __DEFAULT: 2ee3d57d-9756-464e-a5e9-04244936cb9e <>: 2ee3d57d-9756-464e-a5e9-04244936cb9e attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "string")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: unique is_array: false name: external_alias_renamed + table: users type: string - uc_terraform_type: userstore_column manifest_id: userstore_column_testunique @@ -50,10 +56,13 @@ resources: __DEFAULT: 349d3861-f91c-4489-a7f2-4c06a57cb0de <>: 349d3861-f91c-4489-a7f2-4c06a57cb0de attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "email")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: unique is_array: false name: testunique + table: users type: email - uc_terraform_type: userstore_column manifest_id: userstore_column_picture @@ -61,10 +70,13 @@ resources: __DEFAULT: 4d4d0757-3bc2-424d-9caf-a930edb49b69 <>: 4d4d0757-3bc2-424d-9caf-a930edb49b69 attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "string")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: none is_array: false name: picture + table: users type: string - uc_terraform_type: userstore_column manifest_id: userstore_column_nickname @@ -72,10 +84,13 @@ resources: __DEFAULT: 83cc42b0-da8c-4a61-9db1-da70f21bab60 <>: 83cc42b0-da8c-4a61-9db1-da70f21bab60 attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "string")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: none is_array: false name: nickname + table: users type: string - uc_terraform_type: userstore_column manifest_id: userstore_column_testcol1 @@ -83,10 +98,13 @@ resources: __DEFAULT: ec449fd6-f76e-48fb-b19d-29a2e6b60ac6 <>: ec449fd6-f76e-48fb-b19d-29a2e6b60ac6 attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "string")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: none is_array: false name: testcol1 + table: users type: string - uc_terraform_type: userstore_column manifest_id: userstore_column_name @@ -94,10 +112,13 @@ resources: __DEFAULT: fe20fd48-a006-4ad8-9208-4aad540d8794 <>: fe20fd48-a006-4ad8-9208-4aad540d8794 attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "string")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: indexed is_array: false name: name + table: users type: string - uc_terraform_type: userstore_column_soft_deleted_retention_duration manifest_id: 6af3794c-0741-4011-ba8f-761f4cacae72 @@ -162,6 +183,7 @@ resources: description: Simple test policy that allows all access name: TestPolicy policy_type: composite_or + required_context: {} tag_ids: [] - uc_terraform_type: access_policy_template manifest_id: access_policy_template_BasicTestTemplate diff --git a/e2e-test/lots-of-resources.yaml b/e2e-test/lots-of-resources.yaml index 5001dcc..4a0aefb 100644 --- a/e2e-test/lots-of-resources.yaml +++ b/e2e-test/lots-of-resources.yaml @@ -28,10 +28,13 @@ resources: __DEFAULT: 12b3f133-4ad1-4f11-9d7d-313eb7cb95fa <>: 12b3f133-4ad1-4f11-9d7d-313eb7cb95fa attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "boolean")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: none is_array: false name: email_verified + table: users type: boolean - uc_terraform_type: userstore_column manifest_id: userstore_column_email @@ -39,10 +42,13 @@ resources: __DEFAULT: 2c7a7c9b-90e8-47e4-8f6e-ec73bd2dec16 <>: 2c7a7c9b-90e8-47e4-8f6e-ec73bd2dec16 attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "string")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: indexed is_array: false name: email + table: users type: string - uc_terraform_type: userstore_column manifest_id: userstore_column_external_alias @@ -50,10 +56,13 @@ resources: __DEFAULT: 2ee3d57d-9756-464e-a5e9-04244936cb9e <>: 2ee3d57d-9756-464e-a5e9-04244936cb9e attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "string")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: unique is_array: false name: external_alias + table: users type: string - uc_terraform_type: userstore_column manifest_id: userstore_column_testunique @@ -61,10 +70,13 @@ resources: __DEFAULT: 349d3861-f91c-4489-a7f2-4c06a57cb0de <>: 349d3861-f91c-4489-a7f2-4c06a57cb0de attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "email")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: unique is_array: false name: testunique + table: users type: email - uc_terraform_type: userstore_column manifest_id: userstore_column_picture @@ -72,10 +84,13 @@ resources: __DEFAULT: 4d4d0757-3bc2-424d-9caf-a930edb49b69 <>: 4d4d0757-3bc2-424d-9caf-a930edb49b69 attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "string")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: none is_array: false name: picture + table: users type: string - uc_terraform_type: userstore_column manifest_id: userstore_column_nickname @@ -83,10 +98,13 @@ resources: __DEFAULT: 83cc42b0-da8c-4a61-9db1-da70f21bab60 <>: 83cc42b0-da8c-4a61-9db1-da70f21bab60 attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "string")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: none is_array: false name: nickname + table: users type: string - uc_terraform_type: userstore_column manifest_id: userstore_column_us_address @@ -94,6 +112,7 @@ resources: __DEFAULT: a9f70bc2-1fb5-4da6-b96e-2317cfc47758 <>: a9f70bc2-1fb5-4da6-b96e-2317cfc47758 attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa constraints: fields: - name: City @@ -111,9 +130,11 @@ resources: partial_updates: true unique_id_required: true data_type: '@UC_MANIFEST_ID("userstore_column_data_type_us_address").id' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: indexed is_array: true name: us_address + table: users type: composite - uc_terraform_type: userstore_column manifest_id: userstore_column_testcol1 @@ -121,10 +142,13 @@ resources: __DEFAULT: ec449fd6-f76e-48fb-b19d-29a2e6b60ac6 <>: ec449fd6-f76e-48fb-b19d-29a2e6b60ac6 attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "string")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: none is_array: false name: testcol1 + table: users type: string - uc_terraform_type: userstore_column manifest_id: userstore_column_name @@ -132,10 +156,13 @@ resources: __DEFAULT: fe20fd48-a006-4ad8-9208-4aad540d8794 <>: fe20fd48-a006-4ad8-9208-4aad540d8794 attributes: + access_policy: 3f380e42-0b21-4570-a312-91e1b80386fa data_type: '@UC_SYSTEM_OBJECT("userstore_column_data_type", "string")' + default_transformer: c0b5b2a1-0b1f-4b9f-8b1a-1b1f4b9f8b1a index_type: indexed is_array: false name: name + table: users type: string - uc_terraform_type: userstore_column_soft_deleted_retention_duration manifest_id: 6af3794c-0741-4011-ba8f-761f4cacae72 @@ -215,6 +242,7 @@ resources: template_parameters: '{}' name: TestPolicy policy_type: composite_or + required_context: {} tag_ids: [] - uc_terraform_type: access_policy_template manifest_id: access_policy_template_BasicTestTemplate diff --git a/go.mod b/go.mod index ba1ff1e..c28f813 100644 --- a/go.mod +++ b/go.mod @@ -9,22 +9,18 @@ require ( github.com/zclconf/go-cty v1.14.0 golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f gopkg.in/yaml.v3 v3.0.1 - userclouds.com v1.2.0 + userclouds.com v1.6.0 ) require ( github.com/agext/levenshtein v1.2.1 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect - github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kylelemons/godebug v1.1.0 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect - github.com/patrickmn/go-cache v2.1.0+incompatible // indirect - github.com/redis/go-redis/v9 v9.6.1 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/sergi/go-diff v1.3.1 // indirect github.com/stretchr/testify v1.9.0 // indirect diff --git a/go.sum b/go.sum index 484d01c..dee995b 100644 --- a/go.sum +++ b/go.sum @@ -8,18 +8,10 @@ github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE github.com/alecthomas/repr v0.1.0/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= -github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= -github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= -github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= -github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= -github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= -github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a h1:v6zMvHuY9yue4+QkG/HQ/W67wvtQmWJ4SDo9aK/GIno= github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a/go.mod h1:I79BieaU4fxrw4LMXby6q5OS9XnoR9UIKLOzDFjUmuw= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= @@ -48,13 +40,9 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= -github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= -github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4= -github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= @@ -76,5 +64,5 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -userclouds.com v1.2.0 h1:HD7RfwyjcHGPAZ8mygYf7lujfDt3RnaAKXN24i45oro= -userclouds.com v1.2.0/go.mod h1:/RNPnP4mv7TkUigOHgD7kQJd1MZWjT4NLGTgfP2+hWA= +userclouds.com v1.6.0 h1:jnN3t9O0uMQ7kUtHxb5e6zmjvr8NM6D62IiUythHOW4= +userclouds.com v1.6.0/go.mod h1:RswcLoNVKHQrkHWgC8G9H7msaNiho2uZmw2vN+SBepw= diff --git a/internal/tfstate/tfstate_test.go b/internal/tfstate/tfstate_test.go index 46cbe38..9b78fb4 100644 --- a/internal/tfstate/tfstate_test.go +++ b/internal/tfstate/tfstate_test.go @@ -123,11 +123,11 @@ func TestCreateStateWithDependencies(t *testing.T) { { "schema_version": 0, "attributes": { + "data_type": "00000000-0000-0000-0000-000000000000", "id": "fe20fd48-a006-4ad8-9208-4aad540d8794", "index_type": "none", "is_array": false, - "name": "col1", - "type": "" + "name": "col1" }, "sensitive_attributes": [], "dependencies": [] @@ -143,11 +143,11 @@ func TestCreateStateWithDependencies(t *testing.T) { { "schema_version": 0, "attributes": { + "data_type": "00000000-0000-0000-0000-000000000000", "id": "c860a6d7-c632-4f81-8f5f-597290a9f437", "index_type": "none", "is_array": false, - "name": "col2", - "type": "" + "name": "col2" }, "sensitive_attributes": [], "dependencies": []