Skip to content

Commit

Permalink
Try renaming preview API version again (Azure#11619)
Browse files Browse the repository at this point in the history
* Try renaming preview API version again

* Added preview swagger version

* Another try at adding back the preview apis

* Next try at putting -preview API back

* Fixed typo

* Added Java and Typescript generators to resource manager

* Revert typescript.md to original

* Added js and java languages

* Removed SevSnpVm until we have a stronger confidential VM story

* Removed other SevSnpVm vestiges
  • Loading branch information
LarryOsterman authored Nov 13, 2020
1 parent 14aee4b commit f0356ad
Show file tree
Hide file tree
Showing 26 changed files with 56 additions and 110 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"info": {
"title": "AttestationClient",
"description": "Describes the interface for the per-tenant enclave service.",
"version": "2018-09-01"
"version": "2018-09-01-preview"
},
"x-ms-parameterized-host": {
"hostTemplate": "{tenantBaseUrl}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -419,49 +419,6 @@
}
}
},
"/attest/SevSnpVm": {
"post": {
"tags": [
"attestation"
],
"summary": "Attest to an SEV SNP Virtual Machine.",
"description": "Processes a SEV SNP Boot chain. The type of artifact produced is dependent upon attestation policy.",
"operationId": "Attestation_AttestSevSnpVm",
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"name": "request",
"in": "body",
"description": "Request object containing the quote",
"required": true,
"schema": {
"$ref": "#/definitions/AttestSevSnpVmRequest"
}
}
],
"responses": {
"200": {
"description": "Success",
"schema": {
"$ref": "#/definitions/AttestationResponse"
}
},
"default": {
"description": "Error response describing why the operation failed",
"schema": {
"$ref": "#/definitions/CloudError"
}
}
},
"x-ms-examples": {
"Attest SevSnpVm": {
"$ref": "./examples/AttestSevSnpVm.json"
}
}
}
},
"/certs": {
"get": {
"tags": [
Expand Down Expand Up @@ -823,6 +780,12 @@
"type": "string",
"format": "base64url"
},
"maa-ehd": {
"description": "DEPRECATED: Private Preview version of x-ms-sgx-ehd claim.",
"x-ms-client-name": "DeprecatedEnclaveHeldData2",
"type": "string",
"format": "base64url"
},
"product-id": {
"description": "DEPRECATED: Private Preview version of x-ms-sgx-product-id",
"x-ms-client-name": "DeprecatedProductId",
Expand Down Expand Up @@ -995,45 +958,6 @@
"format": "base64url"
}
}
},
"AttestSevSnpVmRequest": {
"type": "object",
"description": "Attestation request for AMD SEV SNP Virtual Machine",
"properties": {
"reportType": {
"description": "Type of the report payload",
"type": "string",
"x-ms-enum": {
"name": "SevSnpReportType",
"modelAsString": true,
"values": [
{
"value": "HclHyperV",
"description": "SEV SNP report generated by HCL running on HyperV platform"
}
]
},
"enum": [
"HclHyperV"
]
},
"report": {
"description": "Hardware rooted report of the virtual machine being attested",
"type": "string"
},
"runtimeData": {
"description": "Runtime data provided by the enclave at the time of report generation. The MAA will verify that the run time data is known to the attestation target.",
"$ref": "#/definitions/RuntimeData"
},
"initTimeData": {
"description": "Initialization data provided by the enclave at the time of report generation. The MAA will verify that the init time data is known to the attestation target.",
"$ref": "#/definitions/InitTimeData"
},
"draftPolicyForAttestation": {
"description": "Attest against the provided draft policy. Note that the resulting token cannot be validated.",
"type": "string"
}
}
}
},
"parameters": {
Expand Down Expand Up @@ -1063,10 +987,6 @@
"value": "OpenEnclave",
"description": "OpenEnclave extensions to SGX"
},
{
"value": "SevSnpVm",
"description": "AMD SEV SNP Virtual Machine"
},
{
"value": "Tpm",
"description": "Edge TPM Virtualization Based Security"
Expand All @@ -1076,7 +996,6 @@
"enum": [
"SgxEnclave",
"OpenEnclave",
"SevSnpVm",
"Tpm"
]
}
Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions specification/attestation/data-plane/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ These settings apply only when `--tag=package-2018-09-01` is specified on the co

``` yaml $(tag) == 'package-2018-09-01'
input-file:
- Microsoft.Attestation/stable/2018-09-01/attestation.json
- Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
```

### Tag: package-2020-10-01
Expand Down Expand Up @@ -96,7 +96,7 @@ require: $(this-folder)/../../../profiles/readme.md
# all the input files across all versions
input-file:
- $(this-folder)/Microsoft.Attestation/stable/2018-09-01/attestation.json
- $(this-folder)/Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
- $(this-folder)/Microsoft.Attestation/stable/2020-10-01/attestation.json
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"info": {
"title": "AttestationManagementClient",
"description": "Various APIs for managing resources in attestation service. This primarily encompasses per-tenant instance management.",
"version": "2018-09-01"
"version": "2018-09-01-preview"
},
"host": "management.azure.com",
"schemes": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ output-folder: $(azureresourceschema-folder)/schemas

# all the input files in this apiVersion
input-file:
- Microsoft.Attestation/stable/2018-09-01/attestation.json
- Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
- Microsoft.Attestation/stable/2020-10-01/attestation.json

```
42 changes: 42 additions & 0 deletions specification/attestation/resource-manager/readme.java.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
## Java

These settings apply only when `--java` is specified on the command line.
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.

``` yaml $(java)
azure-arm: true
namespace: com.microsoft.azure.management.attestation
license-header: MICROSOFT_MIT_NO_CODEGEN
payload-flattening-threshold: 1
output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-attestation
```
### Java multi-api
```yaml $(java) && $(multiapi)
batch:
- tag: profile-2020-10-01
```
### Tag: profile-2020-09-01 and java
These settings apply only when `--tag=profile-2020-10-01 --java` is specified on the command line.
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.

``` yaml $(tag) == 'profile--2020-10-01' && $(java) && $(multiapi)
java:
namespace: com.microsoft.azure.management.attestation.v2019_09_01
output-folder: $(azure-libraries-for-java-folder)/sdk/attestation/mgmt-v2020_10_01
regenerate-manager: true
generate-interface: true
```

### Tag: profile-2020-10-01

These settings apply only when `--tag=profile-2020-10-01` is specified on the command line.
Creating this tag to pick proper resources from the hybrid profile.

``` yaml $(tag) == 'profile-20-10-01'
input-file:
- Microsoft.Attestation/stable/2020-10-01/attestation.json
```
4 changes: 3 additions & 1 deletion specification/attestation/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ These settings apply only when `--tag=package-2018-09-01` is specified on the co

``` yaml $(tag) == 'package-2018-09-01'
input-file:
- Microsoft.Attestation/stable/2018-09-01/attestation.json
- Microsoft.Attestation/stable/2018-09-01-preview/attestation.json
```

### Tag: package-2020-10-01
Expand All @@ -61,6 +61,8 @@ swagger-to-sdk:
- repo: azure-sdk-for-net
- repo: azure-sdk-for-python
- repo: azure-sdk-for-go
- repo: azure-sdk-for-js
- repo: azure-sdk-for-java
- repo: azure-resource-manager-schemas
after_scripts:
- node sdkauto_afterscript.js attestation/resource-manager
Expand Down

0 comments on commit f0356ad

Please sign in to comment.