Skip to content

Commit

Permalink
Merge branch 'main' into config/remove-unusued-versions
Browse files Browse the repository at this point in the history
  • Loading branch information
stephybun authored Sep 18, 2024
2 parents 6019ed9 + 03867b0 commit f61fa3d
Show file tree
Hide file tree
Showing 2,672 changed files with 101,554 additions and 1,974 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
branches:
- fake_name_to_disable_trigger
paths:
- '.github/workflows/**'
- 'config/microsoft-graph.hcl'
- 'submodules/msgraph-metadata'
- 'tools/importer-msgraph/**'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/automation-regenerate-terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ on:
branches:
- main
paths:
- 'api-definitions/**'
- 'api-definitions/handwritten-resource-manager/**'
- 'api-definitions/resource-manager/**'
- 'tools/generator-terraform/**'
workflow_dispatch: # for manual invocations

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/automation-rest-api-specs-importer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ on:
branches:
- main
paths:
- '.github/workflows/**'
- 'config/**'
- 'config/resource-manager.hcl'
- 'config/resources/**'
- 'submodules/rest-api-specs'
- 'tools/importer-rest-api-specs/**'
workflow_dispatch: # for manual invocations
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/automation-version-bumper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ on:
branches:
- main
paths:
- '.github/workflows/**'
- 'config/**'
- '.github/workflows/automation-version-bumper.yaml'
- 'config/resource-manager.hcl'
- 'submodules/msgraph-metadata'
- 'submodules/rest-api-specs'
- 'tools/version-bumper/**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-data-api-differ.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
types: ['opened', 'synchronize']
paths:
- '.github/workflows/**'
- '.github/workflows/unit-test-data-api-differ.yaml'
- 'tools/data-api-differ/**'

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-data-api-v2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
types: ['opened', 'synchronize']
paths:
- '.github/workflows/**'
- '.github/workflows/unit-test-data-api-v2.yaml'
- 'api-definitions/**'
- 'tools/data-api/**'

Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/unit-test-end-to-end-microsoft-graph.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
name: Verify All Microsoft Graph Services can be Imported and Generated
on:
pull_request:
types: ['opened', 'synchronize']
paths:
- '.github/workflows/unit-test-end-to-end-microsoft-graph.yaml'
- 'config/microsoft-graph.hcl'
- 'tools/generator-go-sdk/**'
- 'tools/importer-msgraph-metadata/**'

jobs:
test:
runs-on: custom-linux-xl
strategy:
fail-fast: true
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
submodules: recursive

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version-file: ./.go-version

- name: "Build and Run importer-msgraph-metadata"
id: import-data
run: |
cd ./tools/importer-msgraph-metadata
make tools
make build
make import
- name: "Run the Go SDK Generator"
run: |
# go go gadget generator
./scripts/automation-generate-go-sdk.sh microsoft-graph
9 changes: 6 additions & 3 deletions .github/workflows/unit-test-end-to-end-resource-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ on:
pull_request:
types: ['opened', 'synchronize']
paths:
- '.github/workflows/**'
- 'config/**'
- '.github/workflows/unit-test-end-to-end-resource-manager.yaml'
- 'config/resource-manager.hcl'
- 'config/resources/**'
- 'tools/generator-go-sdk/**'
- 'tools/importer-rest-api-specs/**'

jobs:
test:
Expand All @@ -32,4 +35,4 @@ jobs:
- name: "Run the Go SDK Generator"
run: |
# go go gadget generator
./scripts/automation-generate-go-sdk.sh
./scripts/automation-generate-go-sdk.sh resource-manager
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-generator-go-sdk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
types: ['opened', 'synchronize']
paths:
- '.github/workflows/**'
- '.github/workflows/unit-test-generator-go-sdk.yaml'
- 'tools/generator-go-sdk/**'

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-generator-terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
types: ['opened', 'synchronize']
paths:
- '.github/workflows/**'
- '.github/workflows/unit-test-generator-terraform.yaml'
- 'tools/generator-terraform/**'

jobs:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/unit-test-rest-api-specs-importer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ on:
pull_request:
types: ['opened', 'synchronize']
paths:
- '.github/workflows/**'
- 'config/**'
- '.github/workflows/unit-test-rest-api-specs-importer.yaml'
- 'config/resource-manager.hcl'
- 'config/resources/**'
- 'submodules/rest-api-specs'
- 'tools/importer-rest-api-specs/**'

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "PolicyComplianceState",
"type": "String",
"values": [
{
"key": "Compliant",
"value": "Compliant"
},
{
"key": "NonCompliant",
"value": "NonCompliant"
},
{
"key": "Pending",
"value": "Pending"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"name": "AllPoliciesContract",
"fields": [
{
"containsDiscriminatedTypeValue": false,
"jsonName": "id",
"name": "Id",
"objectDefinition": {
"type": "String",
"referenceName": null
},
"optional": true,
"readOnly": false,
"required": false,
"sensitive": false
},
{
"containsDiscriminatedTypeValue": false,
"jsonName": "name",
"name": "Name",
"objectDefinition": {
"type": "String",
"referenceName": null
},
"optional": true,
"readOnly": false,
"required": false,
"sensitive": false
},
{
"containsDiscriminatedTypeValue": false,
"jsonName": "properties",
"name": "Properties",
"objectDefinition": {
"type": "Reference",
"referenceName": "AllPoliciesContractProperties"
},
"optional": true,
"readOnly": false,
"required": false,
"sensitive": false
},
{
"containsDiscriminatedTypeValue": false,
"jsonName": "type",
"name": "Type",
"objectDefinition": {
"type": "String",
"referenceName": null
},
"optional": true,
"readOnly": false,
"required": false,
"sensitive": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"name": "AllPoliciesContractProperties",
"fields": [
{
"containsDiscriminatedTypeValue": false,
"jsonName": "complianceState",
"name": "ComplianceState",
"objectDefinition": {
"type": "Reference",
"referenceName": "PolicyComplianceState"
},
"optional": true,
"readOnly": false,
"required": false,
"sensitive": false
},
{
"containsDiscriminatedTypeValue": false,
"jsonName": "referencePolicyId",
"name": "ReferencePolicyId",
"objectDefinition": {
"type": "String",
"referenceName": null
},
"optional": true,
"readOnly": false,
"required": false,
"sensitive": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "ListByService",
"contentType": "application/json; charset=utf-8",
"expectedStatusCodes": [
200
],
"fieldContainingPaginationDetails": "nextLink",
"longRunning": false,
"httpMethod": "GET",
"resourceIdName": "ServiceId",
"responseObject": {
"type": "Reference",
"referenceName": "AllPoliciesContract"
},
"uriSuffix": "/allPolicies"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"name": "ServiceId",
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}",
"segments": [
{
"name": "staticSubscriptions",
"type": "Static",
"value": "subscriptions"
},
{
"name": "subscriptionId",
"type": "SubscriptionId"
},
{
"name": "staticResourceGroups",
"type": "Static",
"value": "resourceGroups"
},
{
"name": "resourceGroupName",
"type": "ResourceGroup"
},
{
"name": "staticProviders",
"type": "Static",
"value": "providers"
},
{
"name": "staticMicrosoftApiManagement",
"type": "ResourceProvider",
"value": "Microsoft.ApiManagement"
},
{
"name": "staticService",
"type": "Static",
"value": "service"
},
{
"name": "serviceName",
"type": "UserSpecified"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"name": "ApiType",
"type": "String",
"values": [
{
"key": "Graphql",
"value": "graphql"
},
{
"key": "Grpc",
"value": "grpc"
},
{
"key": "HTTP",
"value": "http"
},
{
"key": "Odata",
"value": "odata"
},
{
"key": "Soap",
"value": "soap"
},
{
"key": "Websocket",
"value": "websocket"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "BearerTokenSendingMethods",
"type": "String",
"values": [
{
"key": "AuthorizationHeader",
"value": "authorizationHeader"
},
{
"key": "Query",
"value": "query"
}
]
}
Loading

0 comments on commit f61fa3d

Please sign in to comment.