Merge branch 'main' into contoso-stable

Azure · Mar 7, 2025 · ab00990 · ab00990
2 parents 9ae411a + 804cda6
commit ab00990
Show file tree

Hide file tree

Showing 39 changed files with 4,208 additions and 3 deletions.
diff --git a/specification/contosowidgetmanager/resource-manager/readme.md b/specification/contosowidgetmanager/resource-manager/readme.md
@@ -23,6 +23,7 @@ These are the global settings for the containerstorage.
 
 ```yaml
 openapi-type: arm
+openapi-subtype: rpaas
 tag: package-2021-11-01
 ```
 
@@ -44,4 +45,4 @@ input-file:
   - Microsoft.Contoso/preview/2021-10-01-preview/contoso.json
 ```
 
----
+---
diff --git a/...e/2025-03-01/examples/SecurityConnectorsDevOps/CreateOrUpdateAzureDevOpsOrgs_example.json b/...e/2025-03-01/examples/SecurityConnectorsDevOps/CreateOrUpdateAzureDevOpsOrgs_example.json
@@ -0,0 +1,51 @@
+{
+  "parameters": {
+    "subscriptionId": "0806e1cd-cfda-4ff8-b99c-2b0af42cffd3",
+    "resourceGroupName": "myRg",
+    "securityConnectorName": "mySecurityConnectorName",
+    "orgName": "myAzDevOpsOrg",
+    "azureDevOpsOrg": {
+      "properties": {
+        "onboardingState": "NotApplicable",
+        "actionableRemediation": {
+          "state": "Enabled"
+        }
+      }
+    },
+    "api-version": "2025-03-01"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "properties": {
+          "onboardingState": "Onboarded",
+          "actionableRemediation": {
+            "state": "Enabled"
+          },
+          "provisioningState": "Succeeded"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/azureDevOpsOrgs/myAzDevOpsOrg",
+        "name": "myAzDevOpsOrg",
+        "type": "Microsoft.Security/securityConnectors/devops/azureDevOpsOrgs"
+      }
+    },
+    "201": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/operationResults/4e826cf1-5c36-4808-a7d2-fb4f5170978b?api-version=2025-03-01"
+      },
+      "body": {
+        "properties": {
+          "onboardingState": "NotApplicable",
+          "actionableRemediation": {
+            "state": "None"
+          },
+          "provisioningState": "Accepted"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/azureDevOpsOrgs/myAzDevOpsOrg",
+        "name": "myAzDevOpsOrg",
+        "type": "Microsoft.Security/securityConnectors/devops/azureDevOpsOrgs"
+      }
+    }
+  }
+}
diff --git a/...25-03-01/examples/SecurityConnectorsDevOps/CreateOrUpdateAzureDevOpsProjects_example.json b/...25-03-01/examples/SecurityConnectorsDevOps/CreateOrUpdateAzureDevOpsProjects_example.json
@@ -0,0 +1,56 @@
+{
+  "parameters": {
+    "subscriptionId": "0806e1cd-cfda-4ff8-b99c-2b0af42cffd3",
+    "resourceGroupName": "myRg",
+    "securityConnectorName": "mySecurityConnectorName",
+    "orgName": "myAzDevOpsOrg",
+    "projectName": "myAzDevOpsProject",
+    "azureDevOpsProject": {
+      "properties": {
+        "onboardingState": "NotApplicable",
+        "actionableRemediation": {
+          "state": "Enabled"
+        }
+      }
+    },
+    "api-version": "2025-03-01"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "properties": {
+          "parentOrgName": "myAzDevOpsOrg",
+          "projectId": "9ebbed8f-a9cc-405f-a647-b235e22179de",
+          "onboardingState": "Onboarded",
+          "actionableRemediation": {
+            "state": "Enabled"
+          },
+          "provisioningState": "Succeeded"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/azureDevOpsOrgs/myAzDevOpsOrg/projects/myAzDevOpsProject",
+        "name": "myAzDevOpsProject",
+        "type": "Microsoft.Security/securityConnectors/devops/azureDevOpsOrgs/projects"
+      }
+    },
+    "201": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/operationResults/4e826cf1-5c36-4808-a7d2-fb4f5170978b?api-version=2025-03-01"
+      },
+      "body": {
+        "properties": {
+          "parentOrgName": "myAzDevOpsOrg",
+          "projectId": "9ebbed8f-a9cc-405f-a647-b235e22179de",
+          "onboardingState": "NotApplicable",
+          "actionableRemediation": {
+            "state": "None"
+          },
+          "provisioningState": "Accepted"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/azureDevOpsOrgs/myAzDevOpsOrg/projects/myAzDevOpsProject",
+        "name": "myAzDevOpsProject",
+        "type": "Microsoft.Security/securityConnectors/devops/azureDevOpsOrgs/projects"
+      }
+    }
+  }
+}
diff --git a/.../2025-03-01/examples/SecurityConnectorsDevOps/CreateOrUpdateAzureDevOpsRepos_example.json b/.../2025-03-01/examples/SecurityConnectorsDevOps/CreateOrUpdateAzureDevOpsRepos_example.json
@@ -0,0 +1,59 @@
+{
+  "parameters": {
+    "subscriptionId": "0806e1cd-cfda-4ff8-b99c-2b0af42cffd3",
+    "resourceGroupName": "myRg",
+    "securityConnectorName": "mySecurityConnectorName",
+    "orgName": "myAzDevOpsOrg",
+    "projectName": "myAzDevOpsProject",
+    "repoName": "myAzDevOpsRepo",
+    "azureDevOpsRepository": {
+      "properties": {
+        "onboardingState": "NotApplicable",
+        "actionableRemediation": {
+          "state": "Enabled"
+        }
+      }
+    },
+    "api-version": "2025-03-01"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "properties": {
+          "parentOrgName": "myAzDevOpsOrg",
+          "parentProjectName": "myAzDevOpsProject",
+          "repoId": "cb64ab91-c9ba-46df-b44c-c769358bccdf",
+          "onboardingState": "Onboarded",
+          "actionableRemediation": {
+            "state": "Enabled"
+          },
+          "provisioningState": "Succeeded"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/azureDevOpsOrgs/myAzDevOpsOrg/projects/myAzDevOpsProject/repos/myAzDevOpsRepo",
+        "name": "myAzDevOpsRepo",
+        "type": "Microsoft.Security/securityConnectors/devops/azureDevOpsOrgs/projects/repos"
+      }
+    },
+    "201": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/operationResults/4e826cf1-5c36-4808-a7d2-fb4f5170978b?api-version=2025-03-01"
+      },
+      "body": {
+        "properties": {
+          "parentOrgName": "myAzDevOpsOrg",
+          "parentProjectName": "myAzDevOpsProject",
+          "repoId": "cb64ab91-c9ba-46df-b44c-c769358bccdf",
+          "onboardingState": "NotApplicable",
+          "actionableRemediation": {
+            "state": "None"
+          },
+          "provisioningState": "Accepted"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/azureDevOpsOrgs/myAzDevOpsOrg/projects/myAzDevOpsProject/repos/myAzDevOpsRepo",
+        "name": "myAzDevOpsRepo",
+        "type": "Microsoft.Security/securityConnectors/devops/azureDevOpsOrgs/projects/repos"
+      }
+    }
+  }
+}
diff --git a/...tyConnectorsDevOps/CreateOrUpdateDevOpsConfigurationsOnboardCurrentAndFuture_example.json b/...tyConnectorsDevOps/CreateOrUpdateDevOpsConfigurationsOnboardCurrentAndFuture_example.json
@@ -0,0 +1,56 @@
+{
+  "parameters": {
+    "subscriptionId": "0806e1cd-cfda-4ff8-b99c-2b0af42cffd3",
+    "resourceGroupName": "myRg",
+    "securityConnectorName": "mySecurityConnectorName",
+    "devOpsConfiguration": {
+      "properties": {
+        "authorization": {
+          "code": "00000000000000000000"
+        },
+        "autoDiscovery": "Enabled"
+      }
+    },
+    "api-version": "2025-03-01"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "properties": {
+          "autoDiscovery": "Enabled",
+          "provisioningState": "Succeeded"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default",
+        "name": "default",
+        "type": "Microsoft.Security/securityConnectors/devops"
+      }
+    },
+    "201": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/operationResults/4e826cf1-5c36-4808-a7d2-fb4f5170978b?api-version=2025-03-01"
+      },
+      "body": {
+        "properties": {
+          "provisioningState": "Accepted"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default",
+        "name": "default",
+        "type": "Microsoft.Security/securityConnectors/devops"
+      }
+    },
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/operationResults/4e826cf1-5c36-4808-a7d2-fb4f5170978b?api-version=2025-03-01"
+      },
+      "body": {
+        "properties": {
+          "provisioningState": "Accepted"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default",
+        "name": "default",
+        "type": "Microsoft.Security/securityConnectors/devops"
+      }
+    }
+  }
+}
diff --git a/...ecurityConnectorsDevOps/CreateOrUpdateDevOpsConfigurationsOnboardCurrentOnly_example.json b/...ecurityConnectorsDevOps/CreateOrUpdateDevOpsConfigurationsOnboardCurrentOnly_example.json
@@ -0,0 +1,56 @@
+{
+  "parameters": {
+    "subscriptionId": "0806e1cd-cfda-4ff8-b99c-2b0af42cffd3",
+    "resourceGroupName": "myRg",
+    "securityConnectorName": "mySecurityConnectorName",
+    "devOpsConfiguration": {
+      "properties": {
+        "authorization": {
+          "code": "00000000000000000000"
+        },
+        "autoDiscovery": "Disabled"
+      }
+    },
+    "api-version": "2025-03-01"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "properties": {
+          "autoDiscovery": "Disabled",
+          "provisioningState": "Succeeded"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default",
+        "name": "default",
+        "type": "Microsoft.Security/securityConnectors/devops"
+      }
+    },
+    "201": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/operationResults/4e826cf1-5c36-4808-a7d2-fb4f5170978b?api-version=2025-03-01"
+      },
+      "body": {
+        "properties": {
+          "provisioningState": "Accepted"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default",
+        "name": "default",
+        "type": "Microsoft.Security/securityConnectors/devops"
+      }
+    },
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/operationResults/4e826cf1-5c36-4808-a7d2-fb4f5170978b?api-version=2025-03-01"
+      },
+      "body": {
+        "properties": {
+          "provisioningState": "Accepted"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default",
+        "name": "default",
+        "type": "Microsoft.Security/securityConnectors/devops"
+      }
+    }
+  }
+}
diff --git a/...s/SecurityConnectorsDevOps/CreateOrUpdateDevOpsConfigurationsOnboardSelected_example.json b/...s/SecurityConnectorsDevOps/CreateOrUpdateDevOpsConfigurationsOnboardSelected_example.json
@@ -0,0 +1,64 @@
+{
+  "parameters": {
+    "subscriptionId": "0806e1cd-cfda-4ff8-b99c-2b0af42cffd3",
+    "resourceGroupName": "myRg",
+    "securityConnectorName": "mySecurityConnectorName",
+    "devOpsConfiguration": {
+      "properties": {
+        "authorization": {
+          "code": "00000000000000000000"
+        },
+        "autoDiscovery": "Disabled",
+        "topLevelInventoryList": [
+          "org1",
+          "org2"
+        ]
+      }
+    },
+    "api-version": "2025-03-01"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "properties": {
+          "autoDiscovery": "Disabled",
+          "topLevelInventoryList": [
+            "org1",
+            "org2"
+          ],
+          "provisioningState": "Succeeded"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default",
+        "name": "default",
+        "type": "Microsoft.Security/securityConnectors/devops"
+      }
+    },
+    "201": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/operationResults/4e826cf1-5c36-4808-a7d2-fb4f5170978b?api-version=2025-03-01"
+      },
+      "body": {
+        "properties": {
+          "provisioningState": "Accepted"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default",
+        "name": "default",
+        "type": "Microsoft.Security/securityConnectors/devops"
+      }
+    },
+    "202": {
+      "headers": {
+        "Azure-AsyncOperation": "https://management.azure.com/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default/operationResults/4e826cf1-5c36-4808-a7d2-fb4f5170978b?api-version=2025-03-01"
+      },
+      "body": {
+        "properties": {
+          "provisioningState": "Accepted"
+        },
+        "id": "/subscriptions/0806e1cd-cfda-4ff8-b99c-2b0af42cffd3/resourceGroups/myRg/providers/Microsoft.Security/securityConnectors/mySecurityConnectorName/devops/default",
+        "name": "default",
+        "type": "Microsoft.Security/securityConnectors/devops"
+      }
+    }
+  }
+}