Update models for release

aws · Nov 23, 2022 · e7544e4 · e7544e4
1 parent 337e447
commit e7544e4
Show file tree

Hide file tree

Showing 18 changed files with 829 additions and 371 deletions.
diff --git a/.changes/3.247.2 b/.changes/3.247.2
@@ -0,0 +1,12 @@
+[
+    {
+        "type": "api-change",
+        "category": "ManagedGrafana",
+        "description": "This release includes support for configuring a Grafana workspace to connect to a datasource within a VPC as well as new APIs for configuring Grafana settings."
+    },
+    {
+        "type": "api-change",
+        "category": "RecycleBin",
+        "description": "This release adds support for Rule Lock for Recycle Bin, which allows you to lock retention rules so that they can no longer be modified or deleted."
+    }
+]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## next release
+
+* `Aws\ManagedGrafana` - This release includes support for configuring a Grafana workspace to connect to a datasource within a VPC as well as new APIs for configuring Grafana settings.
+* `Aws\RecycleBin` - This release adds support for Rule Lock for Recycle Bin, which allows you to lock retention rules so that they can no longer be modified or deleted.
+
 ## 3.247.1 - 2022-11-22
 
 * `Aws\Appflow` - Adding support for Amazon AppFlow to transfer the data to Amazon Redshift databases through Amazon Redshift Data API service. This feature will support the Redshift destination connector on both public and private accessible Amazon Redshift Clusters and Amazon Redshift Serverless.

diff --git a/src/ManagedGrafana/ManagedGrafanaClient.php b/src/ManagedGrafana/ManagedGrafanaClient.php
@@ -19,6 +19,8 @@
  * @method \GuzzleHttp\Promise\Promise describeWorkspaceAsync(array $args = [])
  * @method \Aws\Result describeWorkspaceAuthentication(array $args = [])
  * @method \GuzzleHttp\Promise\Promise describeWorkspaceAuthenticationAsync(array $args = [])
+ * @method \Aws\Result describeWorkspaceConfiguration(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise describeWorkspaceConfigurationAsync(array $args = [])
  * @method \Aws\Result disassociateLicense(array $args = [])
  * @method \GuzzleHttp\Promise\Promise disassociateLicenseAsync(array $args = [])
  * @method \Aws\Result listPermissions(array $args = [])
@@ -37,5 +39,7 @@
  * @method \GuzzleHttp\Promise\Promise updateWorkspaceAsync(array $args = [])
  * @method \Aws\Result updateWorkspaceAuthentication(array $args = [])
  * @method \GuzzleHttp\Promise\Promise updateWorkspaceAuthenticationAsync(array $args = [])
+ * @method \Aws\Result updateWorkspaceConfiguration(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise updateWorkspaceConfigurationAsync(array $args = [])
  */
 class ManagedGrafanaClient extends AwsClient {}
diff --git a/src/RecycleBin/RecycleBinClient.php b/src/RecycleBin/RecycleBinClient.php
@@ -15,8 +15,12 @@
  * @method \GuzzleHttp\Promise\Promise listRulesAsync(array $args = [])
  * @method \Aws\Result listTagsForResource(array $args = [])
  * @method \GuzzleHttp\Promise\Promise listTagsForResourceAsync(array $args = [])
+ * @method \Aws\Result lockRule(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise lockRuleAsync(array $args = [])
  * @method \Aws\Result tagResource(array $args = [])
  * @method \GuzzleHttp\Promise\Promise tagResourceAsync(array $args = [])
+ * @method \Aws\Result unlockRule(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise unlockRuleAsync(array $args = [])
  * @method \Aws\Result untagResource(array $args = [])
  * @method \GuzzleHttp\Promise\Promise untagResourceAsync(array $args = [])
  * @method \Aws\Result updateRule(array $args = [])

diff --git a/src/data/grafana/2020-08-18/api-2.json b/src/data/grafana/2020-08-18/api-2.json
@@ -138,6 +138,22 @@
         {"shape":"InternalServerException"}
       ]
     },
+    "DescribeWorkspaceConfiguration":{
+      "name":"DescribeWorkspaceConfiguration",
+      "http":{
+        "method":"GET",
+        "requestUri":"/workspaces/{workspaceId}/configuration",
+        "responseCode":200
+      },
+      "input":{"shape":"DescribeWorkspaceConfigurationRequest"},
+      "output":{"shape":"DescribeWorkspaceConfigurationResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ]
+    },
     "DisassociateLicense":{
       "name":"DisassociateLicense",
       "http":{
@@ -291,6 +307,24 @@
         {"shape":"AccessDeniedException"},
         {"shape":"InternalServerException"}
       ]
+    },
+    "UpdateWorkspaceConfiguration":{
+      "name":"UpdateWorkspaceConfiguration",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/workspaces/{workspaceId}/configuration",
+        "responseCode":202
+      },
+      "input":{"shape":"UpdateWorkspaceConfigurationRequest"},
+      "output":{"shape":"UpdateWorkspaceConfigurationResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ConflictException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ]
     }
   },
   "shapes":{
@@ -485,10 +519,15 @@
           "shape":"ClientToken",
           "idempotencyToken":true
         },
+        "configuration":{
+          "shape":"OverridableConfigurationJson",
+          "jsonvalue":true
+        },
         "organizationRoleName":{"shape":"OrganizationRoleName"},
         "permissionType":{"shape":"PermissionType"},
         "stackSetName":{"shape":"StackSetName"},
         "tags":{"shape":"TagMap"},
+        "vpcConfiguration":{"shape":"VpcConfiguration"},
         "workspaceDataSources":{"shape":"DataSourceTypesList"},
         "workspaceDescription":{"shape":"Description"},
         "workspaceName":{"shape":"WorkspaceName"},
@@ -514,7 +553,8 @@
         "TIMESTREAM",
         "SITEWISE",
         "ATHENA",
-        "REDSHIFT"
+        "REDSHIFT",
+        "TWINMAKER"
       ]
     },
     "DataSourceTypesList":{
@@ -587,6 +627,27 @@
         "authentication":{"shape":"AuthenticationDescription"}
       }
     },
+    "DescribeWorkspaceConfigurationRequest":{
+      "type":"structure",
+      "required":["workspaceId"],
+      "members":{
+        "workspaceId":{
+          "shape":"WorkspaceId",
+          "location":"uri",
+          "locationName":"workspaceId"
+        }
+      }
+    },
+    "DescribeWorkspaceConfigurationResponse":{
+      "type":"structure",
+      "required":["configuration"],
+      "members":{
+        "configuration":{
+          "shape":"OverridableConfigurationJson",
+          "jsonvalue":true
+        }
+      }
+    },
     "DescribeWorkspaceRequest":{
       "type":"structure",
       "required":["workspaceId"],
@@ -810,6 +871,11 @@
       "member":{"shape":"OrganizationalUnit"},
       "sensitive":true
     },
+    "OverridableConfigurationJson":{
+      "type":"string",
+      "max":65536,
+      "min":2
+    },
     "PaginationToken":{"type":"string"},
     "PermissionEntry":{
       "type":"structure",
@@ -902,6 +968,17 @@
         "NOT_CONFIGURED"
       ]
     },
+    "SecurityGroupId":{
+      "type":"string",
+      "max":255,
+      "min":0
+    },
+    "SecurityGroupIds":{
+      "type":"list",
+      "member":{"shape":"SecurityGroupId"},
+      "max":100,
+      "min":1
+    },
     "ServiceQuotaExceededException":{
       "type":"structure",
       "required":[
@@ -931,6 +1008,17 @@
     },
     "StackSetName":{"type":"string"},
     "String":{"type":"string"},
+    "SubnetId":{
+      "type":"string",
+      "max":255,
+      "min":0
+    },
+    "SubnetIds":{
+      "type":"list",
+      "member":{"shape":"SubnetId"},
+      "max":100,
+      "min":1
+    },
     "TagKey":{
       "type":"string",
       "max":128,
@@ -1111,14 +1199,39 @@
         "authentication":{"shape":"AuthenticationDescription"}
       }
     },
+    "UpdateWorkspaceConfigurationRequest":{
+      "type":"structure",
+      "required":[
+        "configuration",
+        "workspaceId"
+      ],
+      "members":{
+        "configuration":{
+          "shape":"OverridableConfigurationJson",
+          "jsonvalue":true
+        },
+        "workspaceId":{
+          "shape":"WorkspaceId",
+          "location":"uri",
+          "locationName":"workspaceId"
+        }
+      }
+    },
+    "UpdateWorkspaceConfigurationResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateWorkspaceRequest":{
       "type":"structure",
       "required":["workspaceId"],
       "members":{
         "accountAccessType":{"shape":"AccountAccessType"},
         "organizationRoleName":{"shape":"OrganizationRoleName"},
         "permissionType":{"shape":"PermissionType"},
+        "removeVpcConfiguration":{"shape":"Boolean"},
         "stackSetName":{"shape":"StackSetName"},
+        "vpcConfiguration":{"shape":"VpcConfiguration"},
         "workspaceDataSources":{"shape":"DataSourceTypesList"},
         "workspaceDescription":{"shape":"Description"},
         "workspaceId":{
@@ -1202,6 +1315,17 @@
         "OTHER"
       ]
     },
+    "VpcConfiguration":{
+      "type":"structure",
+      "required":[
+        "securityGroupIds",
+        "subnetIds"
+      ],
+      "members":{
+        "securityGroupIds":{"shape":"SecurityGroupIds"},
+        "subnetIds":{"shape":"SubnetIds"}
+      }
+    },
     "WorkspaceDescription":{
       "type":"structure",
       "required":[
@@ -1236,6 +1360,7 @@
         "stackSetName":{"shape":"StackSetName"},
         "status":{"shape":"WorkspaceStatus"},
         "tags":{"shape":"TagMap"},
+        "vpcConfiguration":{"shape":"VpcConfiguration"},
         "workspaceRoleArn":{"shape":"IamRoleArn"}
       }
     },

diff --git a/src/data/grafana/2020-08-18/api-2.json.php b/src/data/grafana/2020-08-18/api-2.json.php