Fix cloud settings schema (#521)

Author: michaeljguarino

assets/src/generated/graphql.ts

@@ -299,6 +299,16 @@ export type AwsCloudAttributes = {
   region?: InputMaybe<Scalars['String']['input']>;
 };
 
+/** aws specific cloud configuration */
+export type AwsCloudSettings = {
+  __typename?: 'AwsCloudSettings';
+  region?: Maybe<Scalars['String']['output']>;
+};
+
+export type AwsNodeCloudAttributes = {
+  launchTemplateId?: InputMaybe<Scalars['String']['input']>;
+};
+
 export type AwsSettingsAttributes = {
   accessKeyId: Scalars['String']['input'];
   secretAccessKey: Scalars['String']['input'];
@@ -311,6 +321,15 @@ export type AzureCloudAttributes = {
   subscriptionId?: InputMaybe<Scalars['String']['input']>;
 };
 
+/** azure-specific cluster cloud configuration */
+export type AzureCloudSettings = {
+  __typename?: 'AzureCloudSettings';
+  location?: Maybe<Scalars['String']['output']>;
+  network?: Maybe<Scalars['String']['output']>;
+  resourceGroup?: Maybe<Scalars['String']['output']>;
+  subscriptionId?: Maybe<Scalars['String']['output']>;
+};
+
 export type AzureSettingsAttributes = {
   clientId: Scalars['ID']['input'];
   clientSecret: Scalars['String']['input'];
@@ -440,10 +459,12 @@ export type CloudProviderSettingsAttributes = {
   gcp?: InputMaybe<GcpSettingsAttributes>;
 };
 
-/** cloud specific settings for a node pool */
+/** the cloud configuration for a cluster */
 export type CloudSettings = {
   __typename?: 'CloudSettings';
-  aws?: Maybe<AwsCloud>;
+  aws?: Maybe<AwsCloudSettings>;
+  azure?: Maybe<AzureCloudSettings>;
+  gcp?: Maybe<GcpCloudSettings>;
 };
 
 export type CloudSettingsAttributes = {
@@ -504,6 +525,8 @@ export type Cluster = {
   service?: Maybe<ServiceDeployment>;
   /** any errors which might have occurred during the bootstrap process */
   serviceErrors?: Maybe<Array<Maybe<ServiceError>>>;
+  /** the cloud settings for this cluster (for instance its aws region) */
+  settings?: Maybe<CloudSettings>;
   /** the status of the cluster as seen from the CAPI operator, since some clusters can be provisioned without CAPI, this can be null */
   status?: Maybe<ClusterStatus>;
   /** key/value tags to filter clusters */
@@ -1128,6 +1151,14 @@ export type GcpCloudAttributes = {
   region?: InputMaybe<Scalars['String']['input']>;
 };
 
+/** gcp specific cluster cloud configuration */
+export type GcpCloudSettings = {
+  __typename?: 'GcpCloudSettings';
+  network?: Maybe<Scalars['String']['output']>;
+  project?: Maybe<Scalars['String']['output']>;
+  region?: Maybe<Scalars['String']['output']>;
+};
+
 export type GcpSettingsAttributes = {
   applicationCredentials: Scalars['String']['input'];
 };
@@ -1671,6 +1702,12 @@ export type Node = {
   status: NodeStatus;
 };
 
+/** cloud specific settings for a node pool */
+export type NodeCloudSettings = {
+  __typename?: 'NodeCloudSettings';
+  aws?: Maybe<AwsCloud>;
+};
+
 export type NodeCondition = {
   __typename?: 'NodeCondition';
   message?: Maybe<Scalars['String']['output']>;
@@ -1691,7 +1728,7 @@ export type NodeMetric = {
 export type NodePool = {
   __typename?: 'NodePool';
   /** cloud specific settings for the node groups */
-  cloudSettings?: Maybe<CloudSettings>;
+  cloudSettings?: Maybe<NodeCloudSettings>;
   /** internal id for this node pool */
   id: Scalars['ID']['output'];
   insertedAt?: Maybe<Scalars['DateTime']['output']>;
@@ -1713,7 +1750,7 @@ export type NodePool = {
 };
 
 export type NodePoolAttributes = {
-  cloudSettings?: InputMaybe<CloudSettingsAttributes>;
+  cloudSettings?: InputMaybe<NodePoolCloudAttributes>;
   instanceType: Scalars['String']['input'];
   labels?: InputMaybe<Scalars['Map']['input']>;
   maxSize: Scalars['Int']['input'];
@@ -1722,6 +1759,10 @@ export type NodePoolAttributes = {
   taints?: InputMaybe<Array<InputMaybe<TaintAttributes>>>;
 };
 
+export type NodePoolCloudAttributes = {
+  aws?: InputMaybe<AwsNodeCloudAttributes>;
+};
+
 export type NodeSpec = {
   __typename?: 'NodeSpec';
   podCidr?: Maybe<Scalars['String']['output']>;

lib/console/deployments/compatibilities/schema.ex

@@ -65,7 +65,7 @@ defmodule Console.Deployments.Compatibilities.AddOn do
     end
   end
 
-  def find_version([%{version: first} = v1, %{version: second} = v2 | rest], version) do
+  def find_version([%{version: first} = v1, %{version: second} = v2 | rest], version) when is_binary(first) and is_binary(second) do
     first  = clean_version(first)
     second = clean_version(second)
 

lib/console/graphql/deployments/cluster.ex

@@ -54,7 +54,7 @@ defmodule Console.GraphQl.Deployments.Cluster do
     field :instance_type,  non_null(:string)
     field :labels,         :map
     field :taints,         list_of(:taint_attributes)
-    field :cloud_settings, :cloud_settings_attributes
+    field :cloud_settings, :node_pool_cloud_attributes
   end
 
   input_object :taint_attributes do
@@ -86,6 +86,14 @@ defmodule Console.GraphQl.Deployments.Cluster do
     field :network,         :string
   end
 
+  input_object :node_pool_cloud_attributes do
+    field :aws, :aws_node_cloud_attributes
+  end
+
+  input_object :aws_node_cloud_attributes do
+    field :launch_template_id, :string
+  end
+
   input_object :cluster_provider_attributes do
     field :name,           non_null(:string)
     field :namespace,      :string
@@ -170,7 +178,7 @@ defmodule Console.GraphQl.Deployments.Cluster do
     field :current_version, :string, description: "current k8s version as told to us by the deployment operator"
     field :handle,          :string, description: "a short, unique human readable name used to identify this cluster and does not necessarily map to the cloud resource name"
     field :installed,       :boolean, description: "whether the deploy operator has been registered for this cluster"
-
+    field :settings,        :cloud_settings, description: "the cloud settings for this cluster (for instance its aws region)"
     field :kas_url, :string, description: "the url of the kas server you can access this cluster from", resolve: fn
       _, _, _ -> {:ok, Console.Deployments.Clusters.kas_proxy_url()}
     end
@@ -235,7 +243,7 @@ defmodule Console.GraphQl.Deployments.Cluster do
     field :spot,           :boolean, description: "whether this is a spot pool or not"
     field :labels,         :map, description: "kubernetes labels to apply to the nodes in this pool, useful for node selectors"
     field :taints,         list_of(:taint), description: "any taints you'd want to apply to a node, for eg preventing scheduling on spot instances"
-    field :cloud_settings, :cloud_settings, description: "cloud specific settings for the node groups"
+    field :cloud_settings, :node_cloud_settings, description: "cloud specific settings for the node groups"
 
     timestamps()
   end
@@ -247,8 +255,35 @@ defmodule Console.GraphQl.Deployments.Cluster do
     field :effect, non_null(:string)
   end
 
-  @desc "cloud specific settings for a node pool"
+  @desc "the cloud configuration for a cluster"
   object :cloud_settings do
+    field :aws,   :aws_cloud_settings
+    field :gcp,   :gcp_cloud_settings
+    field :azure, :azure_cloud_settings
+  end
+
+  @desc "aws specific cloud configuration"
+  object :aws_cloud_settings do
+    field :region, :string
+  end
+
+  @desc "gcp specific cluster cloud configuration"
+  object :gcp_cloud_settings do
+    field :project, :string
+    field :network, :string
+    field :region,  :string
+  end
+
+  @desc "azure-specific cluster cloud configuration"
+  object :azure_cloud_settings do
+    field :location,        :string
+    field :subscription_id, :string
+    field :resource_group,  :string
+    field :network,         :string
+  end
+
+  @desc "cloud specific settings for a node pool"
+  object :node_cloud_settings do
     field :aws, :aws_cloud
   end
 

schema/schema.graphql

@@ -1270,7 +1270,7 @@ input NodePoolAttributes {
   instanceType: String!
   labels: Map
   taints: [TaintAttributes]
-  cloudSettings: CloudSettingsAttributes
+  cloudSettings: NodePoolCloudAttributes
 }
 
 input TaintAttributes {
@@ -1302,6 +1302,14 @@ input AzureCloudAttributes {
   network: String
 }
 
+input NodePoolCloudAttributes {
+  aws: AwsNodeCloudAttributes
+}
+
+input AwsNodeCloudAttributes {
+  launchTemplateId: String
+}
+
 input ClusterProviderAttributes {
   name: String!
   namespace: String
@@ -1426,6 +1434,9 @@ type Cluster {
   "whether the deploy operator has been registered for this cluster"
   installed: Boolean
 
+  "the cloud settings for this cluster (for instance its aws region)"
+  settings: CloudSettings
+
   "the url of the kas server you can access this cluster from"
   kasUrl: String
 
@@ -1518,7 +1529,7 @@ type NodePool {
   taints: [Taint]
 
   "cloud specific settings for the node groups"
-  cloudSettings: CloudSettings
+  cloudSettings: NodeCloudSettings
 
   insertedAt: DateTime
 
@@ -1532,8 +1543,35 @@ type Taint {
   effect: String!
 }
 
-"cloud specific settings for a node pool"
+"the cloud configuration for a cluster"
 type CloudSettings {
+  aws: AwsCloudSettings
+  gcp: GcpCloudSettings
+  azure: AzureCloudSettings
+}
+
+"aws specific cloud configuration"
+type AwsCloudSettings {
+  region: String
+}
+
+"gcp specific cluster cloud configuration"
+type GcpCloudSettings {
+  project: String
+  network: String
+  region: String
+}
+
+"azure-specific cluster cloud configuration"
+type AzureCloudSettings {
+  location: String
+  subscriptionId: String
+  resourceGroup: String
+  network: String
+}
+
+"cloud specific settings for a node pool"
+type NodeCloudSettings {
   aws: AwsCloud
 }