From 4f7bce25612063177cefcd9e13cd87cf90e0aab4 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Thu, 27 Jun 2024 17:22:24 -0700 Subject: [PATCH] Update deps Signed-off-by: Tamal Saha --- charts/ace/values.openapiv3_schema.yaml | 25 ------------------ go.mod | 2 +- go.sum | 4 +-- .../ace-options/values.openapiv3_schema.yaml | 26 +------------------ .../apis/config/v1alpha1/setupconfig_types.go | 25 ++++++------------ .../config/v1alpha1/zz_generated.deepcopy.go | 20 +++++++++++--- vendor/modules.txt | 2 +- 7 files changed, 30 insertions(+), 74 deletions(-) diff --git a/charts/ace/values.openapiv3_schema.yaml b/charts/ace/values.openapiv3_schema.yaml index d3547d7d3..e069e0363 100644 --- a/charts/ace/values.openapiv3_schema.yaml +++ b/charts/ace/values.openapiv3_schema.yaml @@ -21413,33 +21413,8 @@ properties: properties: applicationId: type: string - billingDetails: - properties: - resourceUsageId: - type: string - required: - - resourceUsageId - type: object - plan: - properties: - name: - type: string - product: - type: string - publisher: - type: string - version: - type: string - required: - - name - - product - - publisher - - version - type: object required: - applicationId - - billingDetails - - plan type: object gcp: type: object diff --git a/go.mod b/go.mod index e3274230f..8eff55c17 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.1 toolchain go1.22.4 require ( - go.bytebuilders.dev/resource-model v0.0.11-0.20240627134137-bedc6f0fb031 + go.bytebuilders.dev/resource-model v0.0.11-0.20240628053759-24d56e4753c4 go.openviz.dev/installer v0.0.0-20230802073927-bc7c337886e9 gomodules.xyz/go-sh v0.1.0 k8s.io/api v0.30.1 diff --git a/go.sum b/go.sum index 5d2311d56..1dce06ba5 100644 --- a/go.sum +++ b/go.sum @@ -190,8 +190,8 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.bytebuilders.dev/resource-model v0.0.11-0.20240627134137-bedc6f0fb031 h1:3yuRQCwfA7wBqj8EEifR38WFwNWJOeQ3PQ9U8doIknw= -go.bytebuilders.dev/resource-model v0.0.11-0.20240627134137-bedc6f0fb031/go.mod h1:Jvdo0kmQ3gJuwjfDL3GEt4YFDqsFgenqP9jZrs0+cnw= +go.bytebuilders.dev/resource-model v0.0.11-0.20240628053759-24d56e4753c4 h1:mVSwHYdYVVqVC6DXCFclaOqxMXvEh+3VAOWLpVsdS0A= +go.bytebuilders.dev/resource-model v0.0.11-0.20240628053759-24d56e4753c4/go.mod h1:Jvdo0kmQ3gJuwjfDL3GEt4YFDqsFgenqP9jZrs0+cnw= go.openviz.dev/installer v0.0.0-20230802073927-bc7c337886e9 h1:1JgvOtxky9aqaLA+yzrszl+m4ymF96dK18J++sa/C5c= go.openviz.dev/installer v0.0.0-20230802073927-bc7c337886e9/go.mod h1:kC3TEo+NqZPmxlpiIOcMkg2w4516gFFVYmo2rjwjslg= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/schema/ace-options/values.openapiv3_schema.yaml b/schema/ace-options/values.openapiv3_schema.yaml index 71e4bdd3c..1aaadde78 100644 --- a/schema/ace-options/values.openapiv3_schema.yaml +++ b/schema/ace-options/values.openapiv3_schema.yaml @@ -1205,36 +1205,12 @@ properties: - product-code type: object azure: + description: https://learn.microsoft.com/en-us/azure/azure-resource-manager/managed-applications/publish-notifications properties: applicationId: type: string - billingDetails: - properties: - resourceUsageId: - type: string - required: - - resourceUsageId - type: object - plan: - properties: - name: - type: string - product: - type: string - publisher: - type: string - version: - type: string - required: - - name - - product - - publisher - - version - type: object required: - applicationId - - billingDetails - - plan type: object gcp: type: object diff --git a/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/setupconfig_types.go b/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/setupconfig_types.go index a0ae191e2..dd7d2c2d4 100644 --- a/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/setupconfig_types.go +++ b/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/setupconfig_types.go @@ -51,11 +51,11 @@ type AceSetupInlineConfig struct { // +optional SelfManagement SelfManagement `json:"selfManagement"` // +optional - CloudCredential cloudv1alpha1.Credential `json:"cloudCredential"` + CloudCredential *cloudv1alpha1.Credential `json:"cloudCredential,omitempty"` // +optional - Cluster CAPIClusterConfig `json:"cluster,omitempty"` + Cluster *CAPIClusterConfig `json:"cluster,omitempty"` // +optional - Subscription MarketplaceSubscriptionInfo `json:"subscription,omitempty"` + Subscription *MarketplaceSubscriptionInfo `json:"subscription,omitempty"` } type AcePlatformAdmin struct { @@ -106,21 +106,12 @@ type AWSMarSubscriptionInfo struct { OfferIdentifier string `json:"offer-identifier"` } +// https://learn.microsoft.com/en-us/azure/azure-resource-manager/managed-applications/publish-notifications type AzureSubscriptionInfo struct { - ApplicationID string `json:"applicationId"` - BillingDetails AzureBillingDetails `json:"billingDetails"` - Plan AzurePlan `json:"plan"` -} - -type AzureBillingDetails struct { - ResourceUsageID string `json:"resourceUsageId"` -} - -type AzurePlan struct { - Publisher string `json:"publisher"` - Product string `json:"product"` - Name string `json:"name"` - Version string `json:"version"` + ApplicationID string `json:"applicationId"` + // SubscriptionID string `json:"subscriptionId"` + // ResourceGroupName string `json:"resourceGroupName"` + // ApplicationName string `json:"applicationName"` } type GCPSubscriptionInfo struct{} diff --git a/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/zz_generated.deepcopy.go b/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/zz_generated.deepcopy.go index f1ee5ea24..8061aa751 100644 --- a/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/go.bytebuilders.dev/resource-model/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -22,6 +22,8 @@ limitations under the License. package v1alpha1 import ( + cloudv1alpha1 "go.bytebuilders.dev/resource-model/apis/cloud/v1alpha1" + runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -89,9 +91,21 @@ func (in *AceSetupInlineConfig) DeepCopyInto(out *AceSetupInlineConfig) { *out = *in out.Admin = in.Admin in.SelfManagement.DeepCopyInto(&out.SelfManagement) - in.CloudCredential.DeepCopyInto(&out.CloudCredential) - in.Cluster.DeepCopyInto(&out.Cluster) - in.Subscription.DeepCopyInto(&out.Subscription) + if in.CloudCredential != nil { + in, out := &in.CloudCredential, &out.CloudCredential + *out = new(cloudv1alpha1.Credential) + (*in).DeepCopyInto(*out) + } + if in.Cluster != nil { + in, out := &in.Cluster, &out.Cluster + *out = new(CAPIClusterConfig) + (*in).DeepCopyInto(*out) + } + if in.Subscription != nil { + in, out := &in.Subscription, &out.Subscription + *out = new(MarketplaceSubscriptionInfo) + (*in).DeepCopyInto(*out) + } return } diff --git a/vendor/modules.txt b/vendor/modules.txt index 758084a12..afdbb7ceb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -244,7 +244,7 @@ github.com/yudai/golcs # github.com/zeebo/xxh3 v1.0.2 ## explicit; go 1.17 github.com/zeebo/xxh3 -# go.bytebuilders.dev/resource-model v0.0.11-0.20240627134137-bedc6f0fb031 +# go.bytebuilders.dev/resource-model v0.0.11-0.20240628053759-24d56e4753c4 ## explicit; go 1.22.1 go.bytebuilders.dev/resource-model/apis/cloud go.bytebuilders.dev/resource-model/apis/cloud/v1alpha1