drop pseudonym scope, legacy format/hash support

.github/workflows/ci-terraform-examples-release.yaml

@@ -17,7 +17,7 @@ jobs:
           'examples/gcp-bootstrap-cft',
           'examples/gcp-bootstrap-simple',
         ]
-        terraform_version: [ '~1.6.0', '~1.7.0', '~1.8.0', '~1.9.0', 'latest' ]
+        terraform_version: [ '~1.6.0', '~1.7.0', '~1.8.0', '~1.9.0', '~1.10.0', 'latest' ]
     uses: ./.github/workflows/ci-terraform-example.yaml
     with:
       terraform_version: ${{ matrix.terraform_version }}

.github/workflows/ci-terraform-examples.yaml

@@ -15,7 +15,7 @@ jobs:
                         'examples-dev/aws',
                         'examples-dev/gcp',
         ]
-        terraform_version: [ '~1.6.0', '~1.7.0', '~1.8.0', '~1.9.0', 'latest' ]
+        terraform_version: [ '~1.6.0', '~1.7.0', '~1.8.0', '~1.9.0', '~1.10.0', 'latest' ]
     uses: ./.github/workflows/ci-terraform-example.yaml
     with:
       terraform_version: ${{ matrix.terraform_version }}

.github/workflows/ci-terraform-modules.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        terraform_version: [ '~1.6.0', '~1.7.0', '~1.8.0', '~1.9.0', 'latest' ]
+        terraform_version: [ '~1.6.0', '~1.7.0', '~1.8.0', '~1.9.0', '~1.10.0', 'latest' ]
     steps:
       - name: Check out code
         uses: actions/checkout@v4

CHANGELOG.md

@@ -11,16 +11,21 @@ Changes to be including in future/planned release notes will be added here.
 
 BREAKING:
   - min `azuread` provider is generally 2.44; if you're using an older version, you'll need to
-    upgrade (`terraform init --upgrade`)
-  - `azuread-local-cert` module variables have changed; you must now pass `application_id` instead
+    upgrade (`terraform init --upgrade`); a state refresh (`terraform refresh`) may help if it complains about unknown attributes
+    present in your state
+   - `azuread-local-cert` module variables have changed; you must now pass `application_id` instead
     of `application_object_id`; these refer to different values you can obtain via the [Microsoft Entra admin center](https://entra.microsoft.com/#home)
     portal (formally Azure AD portal blade)
   - variables to `aws-host`/`gcp-host` modules to have changed slightly; if you initially copied an
     example based on 0.4.x, you may have to update some variable names in your `main.tf`.
-  - min `google` provider is not 5.0; this applies whether you're using GCP-hosted proxy, or merely Google Workspace as a
+  - min `google` provider is now 5.0; this applies whether you're using GCP-hosted proxy, or merely Google Workspace as a
     data source
   - various migrations applicable to 0.4.x have been removed; if upgrading from 0.4.x, make sure you first upgrade to latest version of 0.4.x (eg, 0.4.61), run
     `terraform apply`, and THEN update to 0.5.x
+  - the v0.3 pseudonymization algorithm is no longer supported; attempting to do so should result in an error
+  - `scope` field will no longer be sent with JSON-encoded pseudonyms.
+
+
 
 ## [0.4.61](https://github.com/Worklytics/psoxy/release/tag/v0.4.61)
  - added some `columnsToPseudonymizeIfPresent` to survey bulk connectors; these are to avoid PII

docs/sources/asana/example-api-responses/sanitized/stories.json

@@ -8,11 +8,11 @@
       "resource_subtype":"comment_added",
       "sticker_name":"dancing_unicorn",
       "assignee":{
-        "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+        "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
         "resource_type":"user"
       },
       "created_by":{
-        "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+        "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
         "resource_type":"user"
       },
       "custom_field":{
@@ -60,15 +60,15 @@
         "resource_type":"task"
       },
       "follower":{
-        "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+        "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
         "resource_type":"user"
       },
       "hearted":false,
       "hearts":[
         {
           "gid":"12345",
           "user":{
-            "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+            "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
             "resource_type":"user"
           }
         }
@@ -79,7 +79,7 @@
         {
           "gid":"12345",
           "user":{
-            "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+            "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
             "resource_type":"user"
           }
         }
@@ -148,7 +148,7 @@
         "resource_type":"story",
         "created_at":"2012-02-22T02:06:58.147Z",
         "created_by":{
-          "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+          "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
           "resource_type":"user"
         },
         "resource_subtype":"comment_added",

docs/sources/asana/example-api-responses/sanitized/task.json

@@ -7,7 +7,7 @@
     "completed":false,
     "completed_at":"2012-02-22T02:06:58.147Z",
     "completed_by":{
-      "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+      "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
       "resource_type":"user"
     },
     "created_at":"2012-02-22T02:06:58.147Z",
@@ -30,7 +30,7 @@
       {
         "gid":"12345",
         "user":{
-          "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+          "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
           "resource_type":"user"
         }
       }
@@ -41,7 +41,7 @@
       {
         "gid":"12345",
         "user":{
-          "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+          "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
           "resource_type":"user"
         }
       }
@@ -66,7 +66,7 @@
     "start_at":"2019-09-14T02:06:58.147Z",
     "start_on":"2019-09-14",
     "assignee":{
-      "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+      "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
       "resource_type":"user"
     },
     "assignee_section":{
@@ -78,7 +78,7 @@
         "gid":"12345",
         "resource_type":"custom_field",
         "created_by":{
-          "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+          "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
           "resource_type":"user"
         },
         "currency_code":"EUR",
@@ -118,7 +118,7 @@
         "number_value":5.2,
         "people_value":[
           {
-            "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+            "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
             "resource_type":"user"
           }
         ],
@@ -130,7 +130,7 @@
     ],
     "followers":[
       {
-        "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+        "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
         "resource_type":"user"
       }
     ],

docs/sources/asana/example-api-responses/sanitized/tasks.json

@@ -8,7 +8,7 @@
       "completed":false,
       "completed_at":"2012-02-22T02:06:58.147Z",
       "completed_by":{
-        "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+        "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
         "resource_type":"user"
       },
       "created_at":"2012-02-22T02:06:58.147Z",
@@ -31,7 +31,7 @@
         {
           "gid":"12345",
           "user":{
-            "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+            "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
             "resource_type":"user"
           }
         }
@@ -42,7 +42,7 @@
         {
           "gid":"12345",
           "user":{
-            "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+            "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
             "resource_type":"user"
           }
         }
@@ -67,7 +67,7 @@
       "start_at":"2019-09-14T02:06:58.147Z",
       "start_on":"2019-09-14",
       "assignee":{
-        "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+        "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
         "resource_type":"user"
       },
       "assignee_section":{
@@ -79,7 +79,7 @@
           "gid":"12345",
           "resource_type":"custom_field",
           "created_by":{
-            "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+            "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
             "resource_type":"user"
           },
           "currency_code":"EUR",
@@ -121,7 +121,7 @@
       ],
       "followers":[
         {
-          "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
+          "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\"}",
           "resource_type":"user"
         }
       ],

docs/sources/asana/example-api-responses/sanitized/users.json

@@ -1,9 +1,9 @@
 {
   "data":[
     {
-      "gid":"{\"scope\":\"asana\",\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\",\"reversible\":\"p~r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaGzFatT5PGvb7S57rNnHGwT\"}",
+      "gid":"{\"hash\":\"r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaE\",\"reversible\":\"p~r4ONZUfEyn9MUkcyDQkQ5MBNpdIerM24MasxFpuQBaGzFatT5PGvb7S57rNnHGwT\"}",
       "resource_type":"user",
-      "email":"{\"scope\":\"email\",\"domain\":\"example.com\",\"hash\":\"j-MVT2zWPkD22C8GXQVj1aWjS0DGVErUaRim930Sitw\"}",
+      "email":"{\"domain\":\"example.com\",\"hash\":\"j-MVT2zWPkD22C8GXQVj1aWjS0DGVErUaRim930Sitw\"}",
       "workspaces":[
         {
           "gid":"12345",

docs/sources/atlassian/jira/example-api-responses/sanitized/group_member.json

@@ -8,16 +8,16 @@
   "values":[
     {
       "key":"",
-      "accountId":"{\"scope\":\"jira\",\"hash\":\"nrSd0Q7Yg81NfVbwLq6FUnyOBL7lunEWD-2Raiuy9HI\"}",
-      "emailAddress":"{\"scope\":\"email\",\"domain\":\"example.com\",\"hash\":\"UltPZuWYQhKbkt6c-42zy9-Fn2K9TKXJrySsEkApt58\"}",
+      "accountId":"{\"hash\":\"nrSd0Q7Yg81NfVbwLq6FUnyOBL7lunEWD-2Raiuy9HI\"}",
+      "emailAddress":"{\"domain\":\"example.com\",\"hash\":\"UltPZuWYQhKbkt6c-42zy9-Fn2K9TKXJrySsEkApt58\"}",
       "active":true,
       "timeZone":"Australia/Sydney",
       "accountType":"atlassian"
     },
     {
       "key":"",
-      "accountId":"{\"scope\":\"jira\",\"hash\":\"R2MoDHOKLMjyo0mcmJkEHExyoMWcr1luvoB4IZEZlDQ\"}",
-      "emailAddress":"{\"scope\":\"email\",\"domain\":\"example.com\",\"hash\":\"gNFNvSKDH7Fur6w-eDDOFy_oNi69ZmKLWijejL6TFe0\"}",
+      "accountId":"{\"hash\":\"R2MoDHOKLMjyo0mcmJkEHExyoMWcr1luvoB4IZEZlDQ\"}",
+      "emailAddress":"{\"domain\":\"example.com\",\"hash\":\"gNFNvSKDH7Fur6w-eDDOFy_oNi69ZmKLWijejL6TFe0\"}",
       "active":false,
       "timeZone":"Australia/Sydney",
       "accountType":"atlassian"

docs/sources/atlassian/jira/example-api-responses/sanitized/issue_changelog.json

@@ -8,7 +8,7 @@
     {
       "id":"10680",
       "author":{
-        "accountId":"{\"scope\":\"jira\",\"hash\":\"_dUKcjeOP82hpF2_-_4EnrTnpuqGC5ov-3cwITIcIs0\"}",
+        "accountId":"{\"hash\":\"_dUKcjeOP82hpF2_-_4EnrTnpuqGC5ov-3cwITIcIs0\"}",
         "active":false,
         "timeZone":"America/New_York",
         "accountType":"atlassian"
@@ -25,7 +25,7 @@
     {
       "id":"10689",
       "author":{
-        "accountId":"{\"scope\":\"jira\",\"hash\":\"_dUKcjeOP82hpF2_-_4EnrTnpuqGC5ov-3cwITIcIs0\"}",
+        "accountId":"{\"hash\":\"_dUKcjeOP82hpF2_-_4EnrTnpuqGC5ov-3cwITIcIs0\"}",
         "active":false,
         "timeZone":"America/New_York",
         "accountType":"atlassian"
@@ -42,7 +42,7 @@
     {
       "id":"10702",
       "author":{
-        "accountId":"{\"scope\":\"jira\",\"hash\":\"_dUKcjeOP82hpF2_-_4EnrTnpuqGC5ov-3cwITIcIs0\"}",
+        "accountId":"{\"hash\":\"_dUKcjeOP82hpF2_-_4EnrTnpuqGC5ov-3cwITIcIs0\"}",
         "active":false,
         "timeZone":"America/New_York",
         "accountType":"atlassian"
@@ -64,8 +64,8 @@
     {
       "id":"10716",
       "author":{
-        "accountId":"{\"scope\":\"jira\",\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
-        "emailAddress":"{\"scope\":\"email\",\"domain\":\"contoso.com\",\"hash\":\"7fwD-7Ki3YuYHHeJgtXUw098eDrnFaTVAxcjy3ZcxVI\"}",
+        "accountId":"{\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
+        "emailAddress":"{\"domain\":\"contoso.com\",\"hash\":\"7fwD-7Ki3YuYHHeJgtXUw098eDrnFaTVAxcjy3ZcxVI\"}",
         "active":true,
         "timeZone":"America/New_York",
         "accountType":"atlassian"
@@ -91,8 +91,8 @@
     {
       "id":"10724",
       "author":{
-        "accountId":"{\"scope\":\"jira\",\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
-        "emailAddress":"{\"scope\":\"email\",\"domain\":\"contoso.com\",\"hash\":\"7fwD-7Ki3YuYHHeJgtXUw098eDrnFaTVAxcjy3ZcxVI\"}",
+        "accountId":"{\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
+        "emailAddress":"{\"domain\":\"contoso.com\",\"hash\":\"7fwD-7Ki3YuYHHeJgtXUw098eDrnFaTVAxcjy3ZcxVI\"}",
         "active":true,
         "timeZone":"America/New_York",
         "accountType":"atlassian"
@@ -103,7 +103,7 @@
           "field":"assignee",
           "fieldtype":"jira",
           "fieldId":"assignee",
-          "tmpFromAccountId":"{\"scope\":\"jira\",\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
+          "tmpFromAccountId":"{\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
           "tmpToAccountId":"null"
         }
       ]

docs/sources/atlassian/jira/example-api-responses/sanitized/issue_comment_v2.json

@@ -7,15 +7,15 @@
       "self":"https://api.atlassian.com/ex/jira/f6eef702-e05d-43ba-bd5c-75fce47d560e/rest/api/3/issue/10709/comment/10024",
       "id":"10024",
       "author":{
-        "accountId":"{\"scope\":\"jira\",\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
-        "emailAddress":"{\"scope\":\"email\",\"domain\":\"contoso.com\",\"hash\":\"7fwD-7Ki3YuYHHeJgtXUw098eDrnFaTVAxcjy3ZcxVI\"}",
+        "accountId":"{\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
+        "emailAddress":"{\"domain\":\"contoso.com\",\"hash\":\"7fwD-7Ki3YuYHHeJgtXUw098eDrnFaTVAxcjy3ZcxVI\"}",
         "active":true,
         "timeZone":"America/New_York",
         "accountType":"atlassian"
       },
       "updateAuthor":{
-        "accountId":"{\"scope\":\"jira\",\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
-        "emailAddress":"{\"scope\":\"email\",\"domain\":\"contoso.com\",\"hash\":\"7fwD-7Ki3YuYHHeJgtXUw098eDrnFaTVAxcjy3ZcxVI\"}",
+        "accountId":"{\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
+        "emailAddress":"{\"domain\":\"contoso.com\",\"hash\":\"7fwD-7Ki3YuYHHeJgtXUw098eDrnFaTVAxcjy3ZcxVI\"}",
         "active":true,
         "timeZone":"America/New_York",
         "accountType":"atlassian"

docs/sources/atlassian/jira/example-api-responses/sanitized/issue_comment_v3.json

@@ -7,8 +7,8 @@
       "self":"https://api.atlassian.com/ex/jira/f6eef702-e05d-43ba-bd5c-75fce47d560e/rest/api/3/issue/10709/comment/10024",
       "id":"10024",
       "author":{
-        "accountId":"{\"scope\":\"jira\",\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
-        "emailAddress":"{\"scope\":\"email\",\"domain\":\"contoso.com\",\"hash\":\"7fwD-7Ki3YuYHHeJgtXUw098eDrnFaTVAxcjy3ZcxVI\"}",
+        "accountId":"{\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
+        "emailAddress":"{\"domain\":\"contoso.com\",\"hash\":\"7fwD-7Ki3YuYHHeJgtXUw098eDrnFaTVAxcjy3ZcxVI\"}",
         "active":true,
         "timeZone":"America/New_York",
         "accountType":"atlassian"
@@ -23,7 +23,7 @@
               {
                 "type":"mention",
                 "attrs":{
-                  "id":"{\"scope\":\"jira\",\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
+                  "id":"{\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
                   "accessLevel":""
                 }
               },
@@ -35,8 +35,8 @@
         ]
       },
       "updateAuthor":{
-        "accountId":"{\"scope\":\"jira\",\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
-        "emailAddress":"{\"scope\":\"email\",\"domain\":\"contoso.com\",\"hash\":\"7fwD-7Ki3YuYHHeJgtXUw098eDrnFaTVAxcjy3ZcxVI\"}",
+        "accountId":"{\"hash\":\"7Z5-G-SoDUxVDxHtoJZFqVZ-ri3XiGo3ylaDNUVtY6Q\"}",
+        "emailAddress":"{\"domain\":\"contoso.com\",\"hash\":\"7fwD-7Ki3YuYHHeJgtXUw098eDrnFaTVAxcjy3ZcxVI\"}",
         "active":true,
         "timeZone":"America/New_York",
         "accountType":"atlassian"