From 5b72c492ee01c60ff0ecc4d7595bea09d1b437af Mon Sep 17 00:00:00 2001 From: Jakob Gray <20209054+JakobGray@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:08:42 -0400 Subject: [PATCH] Update wif_configs path and remove wif_templates path --- ...late_resource.model => gcp_resource.model} | 10 +-- model/clusters_mgmt/v1/root_resource.model | 11 +-- .../clusters_mgmt/v1/wif_template_type.model | 22 ------ .../v1/wif_templates_resource.model | 73 ------------------- ...late_resource.model => gcp_resource.model} | 10 +-- .../v2alpha1/root_resource.model | 11 +-- .../v2alpha1/wif_template_type.model | 22 ------ .../v2alpha1/wif_templates_resource.model | 73 ------------------- 8 files changed, 16 insertions(+), 216 deletions(-) rename model/clusters_mgmt/v1/{wif_template_resource.model => gcp_resource.model} (78%) delete mode 100644 model/clusters_mgmt/v1/wif_template_type.model delete mode 100644 model/clusters_mgmt/v1/wif_templates_resource.model rename model/clusters_mgmt/v2alpha1/{wif_template_resource.model => gcp_resource.model} (78%) delete mode 100644 model/clusters_mgmt/v2alpha1/wif_template_type.model delete mode 100644 model/clusters_mgmt/v2alpha1/wif_templates_resource.model diff --git a/model/clusters_mgmt/v1/wif_template_resource.model b/model/clusters_mgmt/v1/gcp_resource.model similarity index 78% rename from model/clusters_mgmt/v1/wif_template_resource.model rename to model/clusters_mgmt/v1/gcp_resource.model index 350343d9..2d707e5e 100644 --- a/model/clusters_mgmt/v1/wif_template_resource.model +++ b/model/clusters_mgmt/v1/gcp_resource.model @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Manages a specific wif_template. -resource WifTemplate { - // Retrieves the details of the wif_template. - method Get { - out Body WifTemplate +// Manages the collection of gcp endpoints. +resource GCP { + // Reference to the resource that manages wif_configs + locator WifConfigs { + target WifConfigs } } diff --git a/model/clusters_mgmt/v1/root_resource.model b/model/clusters_mgmt/v1/root_resource.model index ab3761d3..1cd9edfc 100644 --- a/model/clusters_mgmt/v1/root_resource.model +++ b/model/clusters_mgmt/v1/root_resource.model @@ -127,13 +127,8 @@ resource Root { target StorageQuotaValues } - // Reference to the resource that manages wif_configs - locator WifConfigs { - target WifConfigs - } - - // Reference to the resource that manages wif_templates - locator WifTemplates { - target WifTemplate + // Reference to the resource that manages the collection of gcp endpoints. + locator GCP { + target GCP } } diff --git a/model/clusters_mgmt/v1/wif_template_type.model b/model/clusters_mgmt/v1/wif_template_type.model deleted file mode 100644 index 33aebe7d..00000000 --- a/model/clusters_mgmt/v1/wif_template_type.model +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright (c) 2024 Red Hat, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Definition of an wif_template resource. -class WifTemplate { - // The list of service accounts and their associated roles that this template - // would require to be configured on the user's GCP project. - ServiceAccounts []WifServiceAccount -} diff --git a/model/clusters_mgmt/v1/wif_templates_resource.model b/model/clusters_mgmt/v1/wif_templates_resource.model deleted file mode 100644 index 0a2802f0..00000000 --- a/model/clusters_mgmt/v1/wif_templates_resource.model +++ /dev/null @@ -1,73 +0,0 @@ -/* -Copyright (c) 2024 Red Hat, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Manages the collection of wif_templates. -// wif_templates hold the GCP resource requirements for wif deployments. -// wif_config resources are based off of wif_templates during creation. -resource WifTemplates { - // Retrieves the list of wif_templates - method List { - // Index of the requested page, where one corresponds to the first page. - in out Page Integer = 1 - - // Maximum number of items that will be contained in the returned page. - in out Size Integer = 100 - - // Search criteria. - // - // The syntax of this parameter is similar to the syntax of the _where_ clause of a - // SQL statement, but using the names of the attributes of the cluster instead of - // the names of the columns of a table. For example, in order to retrieve all the - // clusters with a name starting with `my` in the `us-east-1` region the value - // should be: - // - // ```sql - // name like 'my%' and region.id = 'us-east-1' - // ``` - // - // If the parameter isn't provided, or if the value is empty, then all the - // wif_templates that the user has permission to see will be returned. - in Search String - - // Order criteria. - // - // The syntax of this parameter is similar to the syntax of the _order by_ clause of - // a SQL statement, but using the names of the attributes of the cluster instead of - // the names of the columns of a table. For example, in order to sort the clusters - // descending by region identifier the value should be: - // - // ```sql - // region.id desc - // ``` - // - // If the parameter isn't provided, or if the value is empty, then the order of the - // results is undefined. - in Order String - - // Total number of items of the collection that match the search criteria, - // regardless of the size of the page. - out Total Integer - - // Retrieved list of wif_templates. - out Items []WifTemplate - } - - // Returns a reference to the service that manages a specific wif_template. - locator WifTemplate { - target WifTemplate - variable ID - } -} diff --git a/model/clusters_mgmt/v2alpha1/wif_template_resource.model b/model/clusters_mgmt/v2alpha1/gcp_resource.model similarity index 78% rename from model/clusters_mgmt/v2alpha1/wif_template_resource.model rename to model/clusters_mgmt/v2alpha1/gcp_resource.model index 350343d9..2d707e5e 100644 --- a/model/clusters_mgmt/v2alpha1/wif_template_resource.model +++ b/model/clusters_mgmt/v2alpha1/gcp_resource.model @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Manages a specific wif_template. -resource WifTemplate { - // Retrieves the details of the wif_template. - method Get { - out Body WifTemplate +// Manages the collection of gcp endpoints. +resource GCP { + // Reference to the resource that manages wif_configs + locator WifConfigs { + target WifConfigs } } diff --git a/model/clusters_mgmt/v2alpha1/root_resource.model b/model/clusters_mgmt/v2alpha1/root_resource.model index c358e41c..41c8cd3b 100644 --- a/model/clusters_mgmt/v2alpha1/root_resource.model +++ b/model/clusters_mgmt/v2alpha1/root_resource.model @@ -127,13 +127,8 @@ resource Root { target StorageQuotaValues } - // Reference to the resource that manages wif_configs - locator WifConfigs { - target WifConfigs - } - - // Reference to the resource that manages wif_templates - locator WifTemplates { - target WifTemplate + // Reference to the resource that manages the collection of gcp endpoints. + locator GCP { + target GCP } } diff --git a/model/clusters_mgmt/v2alpha1/wif_template_type.model b/model/clusters_mgmt/v2alpha1/wif_template_type.model deleted file mode 100644 index 33aebe7d..00000000 --- a/model/clusters_mgmt/v2alpha1/wif_template_type.model +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright (c) 2024 Red Hat, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Definition of an wif_template resource. -class WifTemplate { - // The list of service accounts and their associated roles that this template - // would require to be configured on the user's GCP project. - ServiceAccounts []WifServiceAccount -} diff --git a/model/clusters_mgmt/v2alpha1/wif_templates_resource.model b/model/clusters_mgmt/v2alpha1/wif_templates_resource.model deleted file mode 100644 index 0a2802f0..00000000 --- a/model/clusters_mgmt/v2alpha1/wif_templates_resource.model +++ /dev/null @@ -1,73 +0,0 @@ -/* -Copyright (c) 2024 Red Hat, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Manages the collection of wif_templates. -// wif_templates hold the GCP resource requirements for wif deployments. -// wif_config resources are based off of wif_templates during creation. -resource WifTemplates { - // Retrieves the list of wif_templates - method List { - // Index of the requested page, where one corresponds to the first page. - in out Page Integer = 1 - - // Maximum number of items that will be contained in the returned page. - in out Size Integer = 100 - - // Search criteria. - // - // The syntax of this parameter is similar to the syntax of the _where_ clause of a - // SQL statement, but using the names of the attributes of the cluster instead of - // the names of the columns of a table. For example, in order to retrieve all the - // clusters with a name starting with `my` in the `us-east-1` region the value - // should be: - // - // ```sql - // name like 'my%' and region.id = 'us-east-1' - // ``` - // - // If the parameter isn't provided, or if the value is empty, then all the - // wif_templates that the user has permission to see will be returned. - in Search String - - // Order criteria. - // - // The syntax of this parameter is similar to the syntax of the _order by_ clause of - // a SQL statement, but using the names of the attributes of the cluster instead of - // the names of the columns of a table. For example, in order to sort the clusters - // descending by region identifier the value should be: - // - // ```sql - // region.id desc - // ``` - // - // If the parameter isn't provided, or if the value is empty, then the order of the - // results is undefined. - in Order String - - // Total number of items of the collection that match the search criteria, - // regardless of the size of the page. - out Total Integer - - // Retrieved list of wif_templates. - out Items []WifTemplate - } - - // Returns a reference to the service that manages a specific wif_template. - locator WifTemplate { - target WifTemplate - variable ID - } -}