From 9a78fab4b9b176381567c490695171bc275efe15 Mon Sep 17 00:00:00 2001 From: Liran Roitman Date: Mon, 29 Jan 2024 18:10:30 +0200 Subject: [PATCH] Deprecate Notify resource --- CHANGES.md | 6 ++- model/accounts_mgmt/v1/notify_resource.model | 23 ---------- model/accounts_mgmt/v1/root_resource.model | 5 -- .../v1/subscription_notify_resource.model | 23 ---------- .../v1/subscription_notify_type.model | 46 ------------------- .../v1/subscription_resource.model | 5 -- 6 files changed, 4 insertions(+), 104 deletions(-) delete mode 100644 model/accounts_mgmt/v1/notify_resource.model delete mode 100644 model/accounts_mgmt/v1/subscription_notify_resource.model delete mode 100644 model/accounts_mgmt/v1/subscription_notify_type.model diff --git a/CHANGES.md b/CHANGES.md index ca21418c..fe5e944d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,11 +2,13 @@ This document describes the relevant changes between releases of the API model. +## 0.0.351 Jan 30 2024 +- Deprecate notify resource + ## 0.0.350 Jan 29 2024 - [OCM-5802] Add `ExternalAuthConfig` to `Cluster` model. -## 0.0.349 Jan 28 2024 -- [OCM-5561] Remove redundant fields from /notify_details +## 0.0.349 Jan 28 2024Notify from /notify_details ## 0.0.348 Jan 26 2024 - Add `SubnetOutposts` and `AvailabilityZoneTypes` to `aws_node_pool_type` and `aws_machine_pool_type` models. diff --git a/model/accounts_mgmt/v1/notify_resource.model b/model/accounts_mgmt/v1/notify_resource.model deleted file mode 100644 index 0e307398..00000000 --- a/model/accounts_mgmt/v1/notify_resource.model +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright (c) 2020 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 notify endpoint -resource Notify { - // Notify user related to subscription/cluster via email - method Add { - in out Body SubscriptionNotify - } -} diff --git a/model/accounts_mgmt/v1/root_resource.model b/model/accounts_mgmt/v1/root_resource.model index 950633ef..25f83926 100644 --- a/model/accounts_mgmt/v1/root_resource.model +++ b/model/accounts_mgmt/v1/root_resource.model @@ -114,11 +114,6 @@ resource Root { target Labels } - // Reference to the resource that manages the notifications. - locator Notify { - target Notify - } - // Reference to the resource that manages the notifications details. locator NotifyDetails { target NotifyDetails diff --git a/model/accounts_mgmt/v1/subscription_notify_resource.model b/model/accounts_mgmt/v1/subscription_notify_resource.model deleted file mode 100644 index 518ce446..00000000 --- a/model/accounts_mgmt/v1/subscription_notify_resource.model +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright (c) 2020 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 notify endpoint of a subscription resource -resource SubscriptionNotify { - // Notify user related to subscription via email - method Add { - in out Body SubscriptionNotify - } -} diff --git a/model/accounts_mgmt/v1/subscription_notify_type.model b/model/accounts_mgmt/v1/subscription_notify_type.model deleted file mode 100644 index b5bbb74b..00000000 --- a/model/accounts_mgmt/v1/subscription_notify_type.model +++ /dev/null @@ -1,46 +0,0 @@ -/* -Copyright (c) 2020 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. -*/ - -// This struct is a request to send a templated email to a user related to this -// subscription. -struct SubscriptionNotify { - // Indicates which Cluster (internal id) the resource type belongs to - ClusterID String - - // Indicates which Cluster (external id) the resource type belongs to - ClusterUUID String - - // Indicates which Subscription the resource type belongs to - SubscriptionID String - - // The BCC address to be included on the email that is sent - BccAddress String - - // The email subject - Subject String - - // The name of the template used to construct the email contents - TemplateName String - - // Indicates whether to include red hat associates in the email notification - IncludeRedHatAssociates Boolean - - // Indicates whether the service log is internal only to RH - InternalOnly Boolean - - // The values which will be substituted into the templated email - TemplateParameters []TemplateParameter -} diff --git a/model/accounts_mgmt/v1/subscription_resource.model b/model/accounts_mgmt/v1/subscription_resource.model index a0388a10..a1ca67ca 100644 --- a/model/accounts_mgmt/v1/subscription_resource.model +++ b/model/accounts_mgmt/v1/subscription_resource.model @@ -42,11 +42,6 @@ resource Subscription { target GenericLabels } - // Notify a user related to the subscription via email - locator Notify { - target SubscriptionNotify - } - //Reference to the role bindings locator RoleBindings { target RoleBindings