Change ScriptActivityScriptBlock Type Property To Support Parameteriz…

…ation… (#28538) * Change ScriptActivityScriptBlock Type Property To Support Parameterization * fix * Create sdk-suppressions.yaml * add azure-sdk-for-go suppression * Update sdk-suppressions.yaml * Update sdk-suppressions.yaml --------- Co-authored-by: Yuchao Yan <[email protected]> Co-authored-by: Alancere <[email protected]> Co-authored-by: kazrael2119 <[email protected]>
Azure · Apr 17, 2024 · 819d1e1 · 819d1e1
1 parent 47776ca
commit 819d1e1
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 20 deletions.
diff --git a/...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
@@ -8523,16 +8523,9 @@
           "description": "The query text. Type: string (or Expression with resultType string)."
         },
         "type": {
-          "x-ms-enum": {
-            "name": "ScriptType",
-            "modelAsString": true
-          },
-          "enum": [
-            "Query",
-            "NonQuery"
-          ],
-          "type": "string",
-          "description": "The type of the query. Type: string."
+          "type": "object",
+          "x-ms-format": "dfe-string",
+          "description": "The type of the query. Please refer to the ScriptType for valid options. Type: string (or Expression with resultType string)."
         },
         "parameters": {
           "type": "array",
@@ -8627,6 +8620,18 @@
         }
       }
     },
+    "ScriptType": {
+      "description": "The type of the ScriptActivityScriptBlock.",
+      "type": "string",
+      "enum": [
+        "Query",
+        "NonQuery"
+      ],
+      "x-ms-enum": {
+        "name": "ScriptType",
+        "modelAsString": true
+      }
+    },
     "SqlPartitionOption": {
       "description": "The partition mechanism that will be used for Sql read in parallel.",
       "type": "string",

diff --git a/specification/datafactory/resource-manager/sdk-suppressions.yaml b/specification/datafactory/resource-manager/sdk-suppressions.yaml
@@ -0,0 +1,29 @@
+suppressions:
+  azure-sdk-for-python:
+    - package: azure-mgmt-datafactory
+      breaking-changes:
+        - Model ManagedIdentityCredential no longer has parameter resource_id
+  azure-sdk-for-go:
+    - package: sdk/resourcemanager/datafactory/armdatafactory
+      breaking-changes:
+        - Enum `ScriptType` has been removed
+        - Field `ManagedIdentityCredentialResource` of struct `CredentialOperationsClientCreateOrUpdateResponse` has been removed
+        - Field `ManagedIdentityCredentialResource` of struct `CredentialOperationsClientGetResponse` has been removed
+        - Field `TypeProperties` of struct `ManagedIdentityCredential` has been removed
+        - Function `*CredentialOperationsClient.CreateOrUpdate` parameter(s) have been changed from `(context.Context, string, string, string, ManagedIdentityCredentialResource, *CredentialOperationsClientCreateOrUpdateOptions)` to `(context.Context, string, string, string, CredentialResource, *CredentialOperationsClientCreateOrUpdateOptions)`
+        - Struct `ManagedIdentityCredentialResource` has been removed
+        - Struct `ManagedIdentityTypeProperties` has been removed
+        - Type of `AzureFunctionActivityTypeProperties.Headers` has been changed from `map[string]*string` to `map[string]any`
+        - Type of `CredentialListResponse.Value` has been changed from `[]*ManagedIdentityCredentialResource` to `[]*CredentialResource`
+        - Type of `WebActivityTypeProperties.Headers` has been changed from `map[string]*string` to `map[string]any`
+        - Type of `WebHookActivityTypeProperties.Headers` has been changed from `map[string]*string` to `map[string]any`
+  azure-sdk-for-js:
+    - package: "@azure/arm-datafactory"
+      breaking-changes:
+        - Interface ManagedIdentityCredential no longer has parameter resourceId
+        - Operation CredentialOperations.createOrUpdate has a new signature
+        - "Type of parameter headers of interface AzureFunctionActivity is changed from {\n        [propertyName: string]: string;\n    } to {\n        [propertyName: string]: any;\n    }"
+        - "Type of parameter headers of interface WebActivity is changed from {\n        [propertyName: string]: string;\n    } to {\n        [propertyName: string]: any;\n    }"
+        - "Type of parameter headers of interface WebHookActivity is changed from {\n        [propertyName: string]: string;\n    } to {\n        [propertyName: string]: any;\n    }"
+        - Type of parameter type of interface ScriptActivityScriptBlock is changed from ScriptType to any
+        - Type of parameter value of interface CredentialListResponse is changed from ManagedIdentityCredentialResource[] to CredentialResource[]
diff --git a/...fication/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json b/...fication/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json
@@ -7531,16 +7531,8 @@
           "description": "The query text. Type: string (or Expression with resultType string)."
         },
         "type": {
-          "x-ms-enum": {
-            "name": "ScriptType",
-            "modelAsString": true
-          },
-          "enum": [
-            "Query",
-            "NonQuery"
-          ],
-          "type": "string",
-          "description": "The type of the query. Type: string."
+          "type": "object",
+          "description": "The type of the query. Please refer to the ScriptType for valid options. Type: string (or Expression with resultType string)."
         },
         "parameters": {
           "type": "array",
@@ -7628,6 +7620,18 @@
         }
       }
     },
+    "ScriptType": {
+      "description": "The type of the ScriptActivityScriptBlock.",
+      "type": "string",
+      "enum": [
+        "Query",
+        "NonQuery"
+      ],
+      "x-ms-enum": {
+        "name": "ScriptType",
+        "modelAsString": true
+      }
+    },
     "SqlPartitionOption": {
       "description": "The partition mechanism that will be used for Sql read in parallel.",
       "type": "string",