Skip to content

Commit

Permalink
[Astronomer][New Version] Added optional renewalMode and endDate(read…
Browse files Browse the repository at this point in the history
…only) fields in OfferDetails (Azure#30334)

* [Astronomer][New Version] Added optional field autoRenew in LiftrBase.OfferDetails

* Added new version in readme file

* Fixing TypeSpec validation issue

* Fixing TypeSpec validation issue

* Fixed TypeSpec Validation issue

* [Fix]: "id" is required to return in response of GET/PUT resource calls

* [Fix]: "id" is required to return in response of GET/PUT resource calls

* Added "endDate" field in OfferDetails

[Updates]
----------------
- Added "endDate" field in OfferDetails
- Defined AutoRenewStatus enum for autoRenew field
- Defined versioning for stable version "2024-08-27"

* Updated AutoRenewStatus enum values type to "string"

* Updated the ordering of AutoRenewStatus enum values

[Update]
----------------
"Enable" is the default value of auto-renew, so placed at first
position.

* Replaced AutoRenewStatus enum by RenewalMode
  • Loading branch information
vikaschoudharycs097 committed Sep 13, 2024
1 parent 30615d5 commit df8dee3
Show file tree
Hide file tree
Showing 46 changed files with 4,353 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@ enum Versions {
@useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
@useDependency(LiftrBase.Versions.v1_preview)
v1_preview: "2023-06-01-preview",

@doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1 and LiftrBase.Versions.v2024_08_27_preview")
@useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
@useDependency(LiftrBase.Versions.v2024_08_27_preview)
v2024_08_27_preview: "2024-08-27-preview",

@doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1 and LiftrBase.Versions.v2024_08_27")
@useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
@useDependency(LiftrBase.Versions.v2024_08_27)
v2024_08_27: "2024-08-27",
}

@doc("Properties specific to Data Organization resource")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ enum Versions {
@doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1")
@useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
v1_preview: "2023-06-01-preview",

@doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1")
@useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
v2024_08_27_preview: "2024-08-27-preview",

@doc("Dependent on Azure.ResourceManager.Versions.v1_0_Preview_1")
@useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
v2024_08_27: "2024-08-27",
}

@doc("Marketplace subscription status of a resource.")
Expand All @@ -31,6 +39,19 @@ union MarketplaceSubscriptionStatus {
Unsubscribed: "Unsubscribed",
}

@added(Versions.v2024_08_27_preview)
@added(Versions.v2024_08_27)
@doc("Subscription renewal mode")
union RenewalMode {
string,

@doc("Automatic renewal")
Auto: "Auto",

@doc("Manual renewal")
Manual: "Manual",
}

@doc("A string that represents a URI.")
scalar Uri extends string;

Expand Down Expand Up @@ -65,6 +86,17 @@ model OfferDetails {

@doc("Plan Display Name for the marketplace offer")
termId?: string;

@added(Versions.v2024_08_27_preview)
@added(Versions.v2024_08_27)
@doc("Subscription renewal mode")
renewalMode?: RenewalMode;

@added(Versions.v2024_08_27_preview)
@added(Versions.v2024_08_27)
@doc("Current subscription end date and time")
@visibility("read")
endDate?: utcDateTime;
}

@doc("Reusable representation of an email address.")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"title": "Operations_List - generated by [MaximumSet] rule",
"operationId": "Operations_List",
"parameters": {
"api-version": "2024-08-27-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"name": "unrvqmdvyxlrqgprmwere",
"isDataAction": true,
"display": {
"provider": "bcexjgghgfuudhphysqyvqd",
"resource": "gwrdke",
"operation": "apgxpmzwwphtcj",
"description": "lwsooxrhbrcisbahenmvmkbqpkksuq"
},
"origin": "user",
"actionType": "Internal"
}
],
"nextLink": "hupwycy"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"title": "Operations_List - generated by [MinimumSet] rule",
"operationId": "Operations_List",
"parameters": {
"api-version": "2024-08-27-preview"
},
"responses": {
"200": {
"body": {}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
{
"title": "Organizations_CreateOrUpdate - generated by [MaximumSet] rule",
"operationId": "Organizations_CreateOrUpdate",
"parameters": {
"api-version": "2024-08-27-preview",
"subscriptionId": "F7135278-5976-4A8C-826F-B0253284766A",
"resourceGroupName": "rgastronomer",
"organizationName": "U.1-:7",
"resource": {
"properties": {
"marketplace": {
"subscriptionId": "bgvtjtkpxtceyc",
"subscriptionStatus": "PendingFulfillmentStart",
"offerDetails": {
"publisherId": "ckrwwvgcfnuzejhmnywtxgtemd",
"offerId": "o",
"planId": "iirdyveiuvufxgnzbggfbnr",
"planName": "lmzofmdkochgzgqzxsuvipuagqizz",
"termUnit": "pzatfjfycsonpuagfzqsz",
"termId": "nrmbsljsrbwsafuwvpa",
"renewalMode": "Auto"
}
},
"user": {
"firstName": "bvewbyylzjfclpwmozucvjkypq",
"lastName": "nsfq",
"emailAddress": ".K_@e7N-g1.xjqnbPs",
"upn": "ajnhivnhlxebbvbynsoqp",
"phoneNumber": "wincnkeigouajdwhsra"
},
"provisioningState": "Succeeded",
"partnerOrganizationProperties": {
"organizationId": "suracctmi",
"workspaceId": "yiuanhdcukroyytunueqldcuwtfiwg",
"organizationName": "U.1-:7",
"workspaceName": "9.:06",
"singleSignOnProperties": {
"singleSignOnState": "Initial",
"enterpriseAppId": "uv",
"singleSignOnUrl": "zyrtiwivlbtptrszloo",
"aadDomains": [
"rvyrbq"
],
"provisioningState": "Succeeded"
}
}
},
"identity": {
"type": "None",
"userAssignedIdentities": {}
},
"tags": {},
"location": "vyrzuaajyirwimtahombrbsaejcqs"
}
},
"responses": {
"200": {
"body": {
"properties": {
"marketplace": {
"subscriptionId": "bgvtjtkpxtceyc",
"subscriptionStatus": "PendingFulfillmentStart",
"offerDetails": {
"publisherId": "ckrwwvgcfnuzejhmnywtxgtemd",
"offerId": "o",
"planId": "iirdyveiuvufxgnzbggfbnr",
"planName": "lmzofmdkochgzgqzxsuvipuagqizz",
"termUnit": "pzatfjfycsonpuagfzqsz",
"termId": "nrmbsljsrbwsafuwvpa",
"renewalMode": "Auto",
"endDate": "2024-09-09T11:32:38.546Z"
}
},
"user": {
"firstName": "bvewbyylzjfclpwmozucvjkypq",
"lastName": "nsfq",
"emailAddress": ".K_@e7N-g1.xjqnbPs",
"upn": "ajnhivnhlxebbvbynsoqp",
"phoneNumber": "wincnkeigouajdwhsra"
},
"provisioningState": "Succeeded",
"partnerOrganizationProperties": {
"organizationId": "suracctmi",
"workspaceId": "yiuanhdcukroyytunueqldcuwtfiwg",
"organizationName": "U.1-:7",
"workspaceName": "9.:06",
"singleSignOnProperties": {
"singleSignOnState": "Initial",
"enterpriseAppId": "uv",
"singleSignOnUrl": "zyrtiwivlbtptrszloo",
"aadDomains": [
"rvyrbq"
],
"provisioningState": "Succeeded"
}
}
},
"identity": {
"type": "None",
"userAssignedIdentities": {},
"principalId": "b5684bd7-7958-4c0e-9795-d686c31746d2",
"tenantId": "b5684bd7-7958-4c0e-9795-d686c31746d2"
},
"tags": {},
"location": "vyrzuaajyirwimtahombrbsaejcqs",
"id": "mialkreryfu",
"name": "lmdyn",
"type": "tzpcxamgfdfxervw",
"systemData": {
"createdBy": "yeyzuhlzka",
"createdByType": "User",
"createdAt": "2024-08-27T06:00:59.057Z",
"lastModifiedBy": "k",
"lastModifiedByType": "User",
"lastModifiedAt": "2024-08-27T06:00:59.057Z"
}
}
},
"201": {
"headers": {
"Azure-AsyncOperation": "https://contoso.com/operationstatus"
},
"body": {
"properties": {
"marketplace": {
"subscriptionId": "bgvtjtkpxtceyc",
"subscriptionStatus": "PendingFulfillmentStart",
"offerDetails": {
"publisherId": "ckrwwvgcfnuzejhmnywtxgtemd",
"offerId": "o",
"planId": "iirdyveiuvufxgnzbggfbnr",
"planName": "lmzofmdkochgzgqzxsuvipuagqizz",
"termUnit": "pzatfjfycsonpuagfzqsz",
"termId": "nrmbsljsrbwsafuwvpa",
"renewalMode": "Auto",
"endDate": "2024-09-09T11:32:38.546Z"
}
},
"user": {
"firstName": "bvewbyylzjfclpwmozucvjkypq",
"lastName": "nsfq",
"emailAddress": ".K_@e7N-g1.xjqnbPs",
"upn": "ajnhivnhlxebbvbynsoqp",
"phoneNumber": "wincnkeigouajdwhsra"
},
"provisioningState": "Succeeded",
"partnerOrganizationProperties": {
"organizationId": "suracctmi",
"workspaceId": "yiuanhdcukroyytunueqldcuwtfiwg",
"organizationName": "U.1-:7",
"workspaceName": "9.:06",
"singleSignOnProperties": {
"singleSignOnState": "Initial",
"enterpriseAppId": "uv",
"singleSignOnUrl": "zyrtiwivlbtptrszloo",
"aadDomains": [
"rvyrbq"
],
"provisioningState": "Succeeded"
}
}
},
"identity": {
"type": "None",
"userAssignedIdentities": {},
"principalId": "b5684bd7-7958-4c0e-9795-d686c31746d2",
"tenantId": "b5684bd7-7958-4c0e-9795-d686c31746d2"
},
"tags": {},
"location": "vyrzuaajyirwimtahombrbsaejcqs",
"id": "mialkreryfu",
"name": "lmdyn",
"type": "tzpcxamgfdfxervw",
"systemData": {
"createdBy": "yeyzuhlzka",
"createdByType": "User",
"createdAt": "2024-08-27T06:00:59.057Z",
"lastModifiedBy": "k",
"lastModifiedByType": "User",
"lastModifiedAt": "2024-08-27T06:00:59.057Z"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"title": "Organizations_Delete - generated by [MaximumSet] rule",
"operationId": "Organizations_Delete",
"parameters": {
"api-version": "2024-08-27-preview",
"subscriptionId": "F7135278-5976-4A8C-826F-B0253284766A",
"resourceGroupName": "rgastronomer",
"organizationName": "U.1-:7"
},
"responses": {
"202": {
"headers": {
"location": "https://contoso.com/operationstatus"
}
},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"title": "Organizations_Get - generated by [MaximumSet] rule",
"operationId": "Organizations_Get",
"parameters": {
"api-version": "2024-08-27-preview",
"subscriptionId": "F7135278-5976-4A8C-826F-B0253284766A",
"resourceGroupName": "rgastronomer",
"organizationName": "U.1-:7"
},
"responses": {
"200": {
"body": {
"properties": {
"marketplace": {
"subscriptionId": "bgvtjtkpxtceyc",
"subscriptionStatus": "PendingFulfillmentStart",
"offerDetails": {
"publisherId": "ckrwwvgcfnuzejhmnywtxgtemd",
"offerId": "o",
"planId": "iirdyveiuvufxgnzbggfbnr",
"planName": "lmzofmdkochgzgqzxsuvipuagqizz",
"termUnit": "pzatfjfycsonpuagfzqsz",
"termId": "nrmbsljsrbwsafuwvpa",
"renewalMode": "Auto",
"endDate": "2024-09-09T11:32:38.546Z"
}
},
"user": {
"firstName": "bvewbyylzjfclpwmozucvjkypq",
"lastName": "nsfq",
"emailAddress": ".K_@e7N-g1.xjqnbPs",
"upn": "ajnhivnhlxebbvbynsoqp",
"phoneNumber": "wincnkeigouajdwhsra"
},
"provisioningState": "Succeeded",
"partnerOrganizationProperties": {
"organizationId": "suracctmi",
"workspaceId": "yiuanhdcukroyytunueqldcuwtfiwg",
"organizationName": "U.1-:7",
"workspaceName": "9.:06",
"singleSignOnProperties": {
"singleSignOnState": "Initial",
"enterpriseAppId": "uv",
"singleSignOnUrl": "zyrtiwivlbtptrszloo",
"aadDomains": [
"rvyrbq"
],
"provisioningState": "Succeeded"
}
}
},
"identity": {
"type": "None",
"userAssignedIdentities": {},
"principalId": "b5684bd7-7958-4c0e-9795-d686c31746d2",
"tenantId": "b5684bd7-7958-4c0e-9795-d686c31746d2"
},
"tags": {},
"location": "vyrzuaajyirwimtahombrbsaejcqs",
"id": "mialkreryfu",
"name": "lmdyn",
"type": "tzpcxamgfdfxervw",
"systemData": {
"createdBy": "yeyzuhlzka",
"createdByType": "User",
"createdAt": "2024-08-27T06:00:59.057Z",
"lastModifiedBy": "k",
"lastModifiedByType": "User",
"lastModifiedAt": "2024-08-27T06:00:59.057Z"
}
}
}
}
}
Loading

0 comments on commit df8dee3

Please sign in to comment.