Bug Fix - Support for Service Manager Proxy API

Andrea Peggion · rashik-bhasin · commit aca8ad90b809 · 2021-12-10T15:42:15.000-08:00
diff --git a/examples/serviceManagerProxy/main.tf b/examples/serviceManagerProxy/main.tf
@@ -0,0 +1,41 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "compartment_id" {}
+
+variable "service_environment_display_name" {
+  default = "displayName"
+}
+
+variable "service_environment_service_environment_type" {
+  default = "serviceEnvironmentType"
+}
+variable "service_environment_id" {
+  default = "123456"
+}
+
+
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
+data "oci_service_manager_proxy_service_environments" "test_service_environments" {
+  #Required
+  compartment_id = var.compartment_id
+
+  #Optional
+  display_name             = var.service_environment_display_name
+  service_environment_id   = var.service_environment_id
+  service_environment_type = var.service_environment_service_environment_type
+}
+
+
diff --git a/oci/service_manager_proxy_service_environment_data_source.go b/oci/service_manager_proxy_service_environment_data_source.go
@@ -66,6 +66,10 @@ func ServiceManagerProxyServiceEnvironmentDataSource() *schema.Resource {
 						// Optional
 
 						// Computed
+						"description": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 						"environment_type": {
 							Type:     schema.TypeString,
 							Computed: true,
@@ -186,6 +190,10 @@ func ServiceDefinitionToMap(obj *oci_service_manager_proxy.ServiceDefinition) ma
 func ServiceEnvironmentEndPointOverviewToMap(obj oci_service_manager_proxy.ServiceEnvironmentEndPointOverview) map[string]interface{} {
 	result := map[string]interface{}{}
 
+	if obj.Description != nil {
+		result["description"] = string(*obj.Description)
+	}
+
 	result["environment_type"] = string(obj.EnvironmentType)
 
 	if obj.Url != nil {
diff --git a/oci/service_manager_proxy_service_environments_data_source.go b/oci/service_manager_proxy_service_environments_data_source.go
@@ -99,6 +99,10 @@ func ServiceManagerProxyServiceEnvironmentsDataSource() *schema.Resource {
 												// Optional
 
 												// Computed
+												"description": {
+													Type:     schema.TypeString,
+													Computed: true,
+												},
 												"environment_type": {
 													Type:     schema.TypeString,
 													Computed: true,
diff --git a/website/docs/d/service_manager_proxy_service_environment.html.markdown b/website/docs/d/service_manager_proxy_service_environment.html.markdown
@@ -10,7 +10,8 @@ description: |-
 # Data Source: oci_service_manager_proxy_service_environment
 This data source provides details about a specific Service Environment resource in Oracle Cloud Infrastructure Service Manager Proxy service.
 
-Gets details of the service environment specified by the serviceEnvironmentId.
+Get the detailed information for a specific service environment.
+
 
 ## Example Usage
 
@@ -26,24 +27,31 @@ data "oci_service_manager_proxy_service_environment" "test_service_environment"
 
 The following arguments are supported:
 
-* `compartment_id` - (Required) The unique identifier for the compartment.
-* `service_environment_id` - (Required) The Id associated with the service environment.
+* `compartment_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) for the compartment.
+* `service_environment_id` - (Required) The unique identifier associated with the service environment. 
+
+	**Note:** Not an [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm). 
 
 
 ## Attributes Reference
 
 The following attributes are exported:
 
-* `compartment_id` - Compartment Id associated with the service.
+* `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) for the compartment.
 * `console_url` - The URL for the console.
 * `id` - Unqiue identifier for the entitlement related to the environment. 
-* `service_definition` - Model for details associated with service
-	* `display_name` - Display name of the service.
-	* `short_display_name` - Short display name of the service.
-	* `type` - The service definition type.
+
+	**Note:** Not an [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm). 
+* `service_definition` - Details for a service definition. 
+	* `display_name` - Display name of the service. For example, "Oracle Retail Order Management Cloud Service". 
+	* `short_display_name` - Short display name of the service. For example, "Retail Order Management". 
+	* `type` - The service definition type. For example, a service definition type "RGBUOROMS"  would be for the service "Oracle Retail Order Management Cloud Service". 
 * `service_environment_endpoints` - Array of service environment end points.
-	* `environment_type` - Service Environemnt EndPoint type.
-	* `url` - Service Environemnt Instance EndPoint url.
+	* `description` - Description of the environment link
+	* `environment_type` - Service environment endpoint type.
+	* `url` - Service environment instance URL.
 * `status` - Status of the entitlement registration for the service.
-* `subscription_id` - The subscription Id corresponding to the service environment Id. 
+* `subscription_id` - The unique subscription ID associated with the service environment ID.
+
+	**Note:** Not an [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm). 
 
diff --git a/website/docs/d/service_manager_proxy_service_environments.html.markdown b/website/docs/d/service_manager_proxy_service_environments.html.markdown
@@ -10,9 +10,8 @@ description: |-
 # Data Source: oci_service_manager_proxy_service_environments
 This data source provides the list of Service Environments in Oracle Cloud Infrastructure Service Manager Proxy service.
 
-List details of environments which the service is authorized to view.
-This includes the service instance endpoints and service definition
-details.
+List the details of Software as a Service (SaaS) environments provisioned by Service Manager.
+Information includes the service instance endpoints and service definition details.
 
 
 ## Example Usage
@@ -33,10 +32,12 @@ data "oci_service_manager_proxy_service_environments" "test_service_environments
 
 The following arguments are supported:
 
-* `compartment_id` - (Required) The unique identifier for the compartment.
+* `compartment_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) for the compartment.
 * `display_name` - (Optional) The display name of the resource.
-* `service_environment_id` - (Optional) The Id associated with the service environment.
-* `service_environment_type` - (Optional) The service definition type of the environment.
+* `service_environment_id` - (Optional) The unique identifier associated with the service environment. 
+
+	**Note:** Not an [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm). 
+* `service_environment_type` - (Optional) The environment's service definition type.  For example, "RGBUOROMS" is the service definition type for "Oracle Retail Order Management Cloud Service". 
 
 
 ## Attributes Reference
@@ -49,16 +50,21 @@ The following attributes are exported:
 
 The following attributes are exported:
 
-* `compartment_id` - Compartment Id associated with the service.
+* `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) for the compartment.
 * `console_url` - The URL for the console.
 * `id` - Unqiue identifier for the entitlement related to the environment. 
-* `service_definition` - Model for details associated with service
-	* `display_name` - Display name of the service.
-	* `short_display_name` - Short display name of the service.
-	* `type` - The service definition type.
+
+	**Note:** Not an [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm). 
+* `service_definition` - Details for a service definition. 
+	* `display_name` - Display name of the service. For example, "Oracle Retail Order Management Cloud Service". 
+	* `short_display_name` - Short display name of the service. For example, "Retail Order Management". 
+	* `type` - The service definition type. For example, a service definition type "RGBUOROMS"  would be for the service "Oracle Retail Order Management Cloud Service". 
 * `service_environment_endpoints` - Array of service environment end points.
-	* `environment_type` - Service Environemnt EndPoint type.
-	* `url` - Service Environemnt Instance EndPoint url.
+	* `description` - Description of the environment link
+	* `environment_type` - Service environment endpoint type.
+	* `url` - Service environment instance URL.
 * `status` - Status of the entitlement registration for the service.
-* `subscription_id` - The subscription Id corresponding to the service environment Id. 
+* `subscription_id` - The unique subscription ID associated with the service environment ID.
+
+	**Note:** Not an [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm). 
 
