Skip to content

Commit

Permalink
Added converse support for custom imported models
Browse files Browse the repository at this point in the history
RequestSpotInstances and RequestSpotFleet feature release.
Adding converse support to CMI API's
Removing FEDERATED from Create/List/Delete/GetDataCatalog API
Adding the following project member designations: PROJECT_CATALOG_VIEWER, PROJECT_CATALOG_CONSUMER and PROJECT_CATALOG_STEWARD in the CreateProjectMembership API and PROJECT_CATALOG_STEWARD designation in the AddPolicyGrant API.
  • Loading branch information
aws-sdk-cpp-automation committed Oct 18, 2024
1 parent c40dd8c commit 9e50751
Show file tree
Hide file tree
Showing 33 changed files with 175 additions and 902 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.429
1.11.430
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ namespace Model

/**
* <p>Indicates that an Amazon S3 canned ACL should be set to control ownership of
* stored query results. When Athena stores query results in Amazon S3, the canned
* ACL is set with the <code>x-amz-acl</code> request header. For more information
* about S3 Object Ownership, see <a
* stored query results, including data files inserted by Athena as the result of
* statements like CTAS or INSERT INTO. When Athena stores query results in Amazon
* S3, the canned ACL is set with the <code>x-amz-acl</code> request header. For
* more information about S3 Object Ownership, see <a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html#object-ownership-overview">Object
* Ownership settings</a> in the <i>Amazon S3 User Guide</i>.</p><p><h3>See
* Also:</h3> <a
Expand All @@ -46,7 +47,8 @@ namespace Model
///@{
/**
* <p>The Amazon S3 canned ACL that Athena should specify when storing query
* results. Currently the only supported canned ACL is
* results, including data files inserted by Athena as the result of statements
* like CTAS or INSERT INTO. Currently the only supported canned ACL is
* <code>BUCKET_OWNER_FULL_CONTROL</code>. If a query runs in a workgroup and the
* workgroup overrides client-side settings, then the Amazon S3 canned ACL
* specified in the workgroup's settings is used for all queries that run in the
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ namespace Model
///@{
/**
* <p>The type of data catalog to create: <code>LAMBDA</code> for a federated
* catalog, <code>GLUE</code> for an Glue Data Catalog, and <code>HIVE</code> for
* an external Apache Hive metastore. <code>FEDERATED</code> is a federated catalog
* for which Athena creates the connection and the Lambda function for you based on
* the parameters that you pass.</p>
* catalog, <code>HIVE</code> for an external hive metastore, or <code>GLUE</code>
* for an Glue Data Catalog.</p>
*/
inline const DataCatalogType& GetType() const{ return m_type; }
inline bool TypeHasBeenSet() const { return m_typeHasBeenSet; }
Expand Down Expand Up @@ -108,20 +106,7 @@ namespace Model
* <code>catalog-id=<i>catalog_id</i> </code> </p> <ul> <li> <p>The
* <code>GLUE</code> data catalog type also applies to the default
* <code>AwsDataCatalog</code> that already exists in your account, of which you
* can have only one and cannot modify.</p> </li> </ul> </li> <li> <p>The
* <code>FEDERATED</code> data catalog type uses one of the following parameters,
* but not both. Use <code>connection-arn</code> for an existing Glue connection.
* Use <code>connection-type</code> and <code>connection-properties</code> to
* specify the configuration setting for a new connection.</p> <ul> <li> <p>
* <code>connection-arn:<i>&lt;glue_connection_arn_to_reuse&gt;</i> </code> </p>
* </li> <li> <p> <code>lambda-role-arn</code> (optional): The execution role to
* use for the Lambda function. If not provided, one is created.</p> </li> <li> <p>
* <code>connection-type:MYSQL|REDSHIFT|....,
* connection-properties:"<i>&lt;json_string&gt;</i>"</code> </p> <p>For <i>
* <code>&lt;json_string&gt;</code> </i>, use escaped JSON text, as in the
* following example.</p> <p>
* <code>"{\"spill_bucket\":\"my_spill\",\"spill_prefix\":\"athena-spill\",\"host\":\"abc12345.snowflakecomputing.com\",\"port\":\"1234\",\"warehouse\":\"DEV_WH\",\"database\":\"TEST\",\"schema\":\"PUBLIC\",\"SecretArn\":\"arn:aws:secretsmanager:ap-south-1:111122223333:secret:snowflake-XHb67j\"}"</code>
* </p> </li> </ul> </li> </ul>
* can have only one and cannot modify.</p> </li> </ul> </li> </ul>
*/
inline const Aws::Map<Aws::String, Aws::String>& GetParameters() const{ return m_parameters; }
inline bool ParametersHasBeenSet() const { return m_parametersHasBeenSet; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#pragma once
#include <aws/athena/Athena_EXPORTS.h>
#include <aws/athena/model/DataCatalog.h>
#include <aws/core/utils/memory/stl/AWSString.h>
#include <utility>

Expand Down Expand Up @@ -33,15 +32,6 @@ namespace Model
AWS_ATHENA_API CreateDataCatalogResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);


///@{

inline const DataCatalog& GetDataCatalog() const{ return m_dataCatalog; }
inline void SetDataCatalog(const DataCatalog& value) { m_dataCatalog = value; }
inline void SetDataCatalog(DataCatalog&& value) { m_dataCatalog = std::move(value); }
inline CreateDataCatalogResult& WithDataCatalog(const DataCatalog& value) { SetDataCatalog(value); return *this;}
inline CreateDataCatalogResult& WithDataCatalog(DataCatalog&& value) { SetDataCatalog(std::move(value)); return *this;}
///@}

///@{

inline const Aws::String& GetRequestId() const{ return m_requestId; }
Expand All @@ -54,8 +44,6 @@ namespace Model
///@}
private:

DataCatalog m_dataCatalog;

Aws::String m_requestId;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
#include <aws/core/utils/memory/stl/AWSString.h>
#include <aws/athena/model/DataCatalogType.h>
#include <aws/core/utils/memory/stl/AWSMap.h>
#include <aws/athena/model/DataCatalogStatus.h>
#include <aws/athena/model/ConnectionType.h>
#include <utility>

namespace Aws
Expand Down Expand Up @@ -78,10 +76,8 @@ namespace Model
///@{
/**
* <p>The type of data catalog to create: <code>LAMBDA</code> for a federated
* catalog, <code>GLUE</code> for an Glue Data Catalog, and <code>HIVE</code> for
* an external Apache Hive metastore. <code>FEDERATED</code> is a federated catalog
* for which Athena creates the connection and the Lambda function for you based on
* the parameters that you pass.</p>
* catalog, <code>HIVE</code> for an external hive metastore, or <code>GLUE</code>
* for an Glue Data Catalog.</p>
*/
inline const DataCatalogType& GetType() const{ return m_type; }
inline bool TypeHasBeenSet() const { return m_typeHasBeenSet; }
Expand Down Expand Up @@ -114,18 +110,7 @@ namespace Model
* <code>catalog-id=<i>catalog_id</i> </code> </p> <ul> <li> <p>The
* <code>GLUE</code> data catalog type also applies to the default
* <code>AwsDataCatalog</code> that already exists in your account, of which you
* can have only one and cannot modify.</p> </li> </ul> </li> <li> <p>The
* <code>FEDERATED</code> data catalog type uses one of the following parameters,
* but not both. Use <code>connection-arn</code> for an existing Glue connection.
* Use <code>connection-type</code> and <code>connection-properties</code> to
* specify the configuration setting for a new connection.</p> <ul> <li> <p>
* <code>connection-arn:<i>&lt;glue_connection_arn_to_reuse&gt;</i> </code> </p>
* </li> <li> <p> <code>connection-type:MYSQL|REDSHIFT|....,
* connection-properties:"<i>&lt;json_string&gt;</i>"</code> </p> <p>For <i>
* <code>&lt;json_string&gt;</code> </i>, use escaped JSON text, as in the
* following example.</p> <p>
* <code>"{\"spill_bucket\":\"my_spill\",\"spill_prefix\":\"athena-spill\",\"host\":\"abc12345.snowflakecomputing.com\",\"port\":\"1234\",\"warehouse\":\"DEV_WH\",\"database\":\"TEST\",\"schema\":\"PUBLIC\",\"SecretArn\":\"arn:aws:secretsmanager:ap-south-1:111122223333:secret:snowflake-XHb67j\"}"</code>
* </p> </li> </ul> </li> </ul>
* can have only one and cannot modify.</p> </li> </ul> </li> </ul>
*/
inline const Aws::Map<Aws::String, Aws::String>& GetParameters() const{ return m_parameters; }
inline bool ParametersHasBeenSet() const { return m_parametersHasBeenSet; }
Expand All @@ -141,66 +126,6 @@ namespace Model
inline DataCatalog& AddParameters(Aws::String&& key, const char* value) { m_parametersHasBeenSet = true; m_parameters.emplace(std::move(key), value); return *this; }
inline DataCatalog& AddParameters(const char* key, const char* value) { m_parametersHasBeenSet = true; m_parameters.emplace(key, value); return *this; }
///@}

///@{
/**
* <p>The status of the creation or deletion of the data catalog.</p> <ul> <li>
* <p>The <code>LAMBDA</code>, <code>GLUE</code>, and <code>HIVE</code> data
* catalog types are created synchronously. Their status is either
* <code>CREATE_COMPLETE</code> or <code>CREATE_FAILED</code>.</p> </li> <li>
* <p>The <code>FEDERATED</code> data catalog type is created asynchronously.</p>
* </li> </ul> <p>Data catalog creation status:</p> <ul> <li> <p>
* <code>CREATE_IN_PROGRESS</code>: Federated data catalog creation in
* progress.</p> </li> <li> <p> <code>CREATE_COMPLETE</code>: Data catalog creation
* complete.</p> </li> <li> <p> <code>CREATE_FAILED</code>: Data catalog could not
* be created.</p> </li> <li> <p> <code>CREATE_FAILED_CLEANUP_IN_PROGRESS</code>:
* Federated data catalog creation failed and is being removed.</p> </li> <li> <p>
* <code>CREATE_FAILED_CLEANUP_COMPLETE</code>: Federated data catalog creation
* failed and was removed.</p> </li> <li> <p>
* <code>CREATE_FAILED_CLEANUP_FAILED</code>: Federated data catalog creation
* failed but could not be removed.</p> </li> </ul> <p>Data catalog deletion
* status:</p> <ul> <li> <p> <code>DELETE_IN_PROGRESS</code>: Federated data
* catalog deletion in progress.</p> </li> <li> <p> <code>DELETE_COMPLETE</code>:
* Federated data catalog deleted.</p> </li> <li> <p> <code>DELETE_FAILED</code>:
* Federated data catalog could not be deleted.</p> </li> </ul>
*/
inline const DataCatalogStatus& GetStatus() const{ return m_status; }
inline bool StatusHasBeenSet() const { return m_statusHasBeenSet; }
inline void SetStatus(const DataCatalogStatus& value) { m_statusHasBeenSet = true; m_status = value; }
inline void SetStatus(DataCatalogStatus&& value) { m_statusHasBeenSet = true; m_status = std::move(value); }
inline DataCatalog& WithStatus(const DataCatalogStatus& value) { SetStatus(value); return *this;}
inline DataCatalog& WithStatus(DataCatalogStatus&& value) { SetStatus(std::move(value)); return *this;}
///@}

///@{
/**
* <p>The type of connection for a <code>FEDERATED</code> data catalog (for
* example, <code>REDSHIFT</code>, <code>MYSQL</code>, or <code>SQLSERVER</code>).
* For information about individual connectors, see <a
* href="https://docs.aws.amazon.com/athena/latest/ug/connectors-available.html">Available
* data source connectors</a>.</p>
*/
inline const ConnectionType& GetConnectionType() const{ return m_connectionType; }
inline bool ConnectionTypeHasBeenSet() const { return m_connectionTypeHasBeenSet; }
inline void SetConnectionType(const ConnectionType& value) { m_connectionTypeHasBeenSet = true; m_connectionType = value; }
inline void SetConnectionType(ConnectionType&& value) { m_connectionTypeHasBeenSet = true; m_connectionType = std::move(value); }
inline DataCatalog& WithConnectionType(const ConnectionType& value) { SetConnectionType(value); return *this;}
inline DataCatalog& WithConnectionType(ConnectionType&& value) { SetConnectionType(std::move(value)); return *this;}
///@}

///@{
/**
* <p>Text of the error that occurred during data catalog creation or deletion.</p>
*/
inline const Aws::String& GetError() const{ return m_error; }
inline bool ErrorHasBeenSet() const { return m_errorHasBeenSet; }
inline void SetError(const Aws::String& value) { m_errorHasBeenSet = true; m_error = value; }
inline void SetError(Aws::String&& value) { m_errorHasBeenSet = true; m_error = std::move(value); }
inline void SetError(const char* value) { m_errorHasBeenSet = true; m_error.assign(value); }
inline DataCatalog& WithError(const Aws::String& value) { SetError(value); return *this;}
inline DataCatalog& WithError(Aws::String&& value) { SetError(std::move(value)); return *this;}
inline DataCatalog& WithError(const char* value) { SetError(value); return *this;}
///@}
private:

Aws::String m_name;
Expand All @@ -214,15 +139,6 @@ namespace Model

Aws::Map<Aws::String, Aws::String> m_parameters;
bool m_parametersHasBeenSet = false;

DataCatalogStatus m_status;
bool m_statusHasBeenSet = false;

ConnectionType m_connectionType;
bool m_connectionTypeHasBeenSet = false;

Aws::String m_error;
bool m_errorHasBeenSet = false;
};

} // namespace Model
Expand Down

This file was deleted.

Loading

0 comments on commit 9e50751

Please sign in to comment.