Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion generator/ServiceClientGeneratorLib/ServiceModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ public List<Operation> S3AllowListOperations
// phase 3 (including those moved from phase 1)
new Operation(this, "CreateSession", DocumentRoot[OperationsKey]["CreateSession"]),
new Operation(this, "GetBucketAnalyticsConfiguration", DocumentRoot[OperationsKey]["GetBucketAnalyticsConfiguration"]),
//new Operation(this, "GetBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["GetBucketIntelligentTieringConfiguration"]),
new Operation(this, "GetBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["GetBucketIntelligentTieringConfiguration"]),
//new Operation(this, "GetBucketInventoryConfiguration", DocumentRoot[OperationsKey]["GetBucketInventoryConfiguration"]),
//new Operation(this, "GetBucketLogging", DocumentRoot[OperationsKey]["GetBucketLogging"]),
new Operation(this, "GetBucketMetricsConfiguration", DocumentRoot[OperationsKey]["GetBucketMetricsConfiguration"]),
Expand Down
15 changes: 15 additions & 0 deletions generator/ServiceModels/s3/s3.customizations.json
Original file line number Diff line number Diff line change
Expand Up @@ -1028,6 +1028,21 @@
"injectXmlMarshallCode": ["IntelligentTieringFilterCustomMarshall(publicRequest, xmlWriter);"]
}
}
],
"predicateListUnmarshallers": [
{
"IntelligentTieringFilter" :{
"predicateListUnmarshallerName" : "IntelligentTieringPredicateListFilterUnmarshaller",
"filterPredicateName": "IntelligentTieringFilterPredicate"
}
}
]
},
"GetBucketIntelligentTieringConfigurationRequest":{
"modify":[
{
"Id" : {"emitPropertyName": "IntelligentTieringId"}
}
]
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,49 +28,11 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
/// <summary>
/// Get InventoryConfiguration Request Marshaller
/// </summary>
public class GetBucketIntelligentTieringConfigurationRequestMarshaller : IMarshaller<IRequest, GetBucketIntelligentTieringConfigurationRequest>, IMarshaller<IRequest, Amazon.Runtime.AmazonWebServiceRequest>
public partial class GetBucketIntelligentTieringConfigurationRequestMarshaller : IMarshaller<IRequest, GetBucketIntelligentTieringConfigurationRequest>, IMarshaller<IRequest, Amazon.Runtime.AmazonWebServiceRequest>
{
public IRequest Marshall(Amazon.Runtime.AmazonWebServiceRequest input)
partial void PreMarshallCustomization(DefaultRequest defaultRequest, GetBucketIntelligentTieringConfigurationRequest publicRequest)
{
return this.Marshall((GetBucketIntelligentTieringConfigurationRequest)input);
}

public IRequest Marshall(GetBucketIntelligentTieringConfigurationRequest getBucketIntelligentTieringConfigurationRequest)
{
IRequest request = new DefaultRequest(getBucketIntelligentTieringConfigurationRequest, "Amazon.S3");

request.Suppress404Exceptions = true;
request.HttpMethod = "GET";

if (string.IsNullOrEmpty(getBucketIntelligentTieringConfigurationRequest.BucketName))
throw new System.ArgumentException("BucketName is a required property and must be set before making this call.", "GetBucketInventoryConfigurationRequest.BucketName");

if (getBucketIntelligentTieringConfigurationRequest.IsSetExpectedBucketOwner())
request.Headers.Add(S3Constants.AmzHeaderExpectedBucketOwner, S3Transforms.ToStringValue(getBucketIntelligentTieringConfigurationRequest.ExpectedBucketOwner));

request.ResourcePath = "/";
request.AddSubResource("intelligent-tiering");
request.AddSubResource("id", getBucketIntelligentTieringConfigurationRequest.IntelligentTieringId);
request.UseQueryString = true;

return request;
}

private static GetBucketIntelligentTieringConfigurationRequestMarshaller _instance;

/// <summary>
/// Singleton for marshaller
/// </summary>
public static GetBucketIntelligentTieringConfigurationRequestMarshaller Instance
{
get
{
if (_instance == null)
{
_instance = new GetBucketIntelligentTieringConfigurationRequestMarshaller();
}
return _instance;
}
defaultRequest.Suppress404Exceptions = true;
}
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,29 +1,39 @@
/*
*Copyright Amazon.com, Inc.or its affiliates. All Rights Reserved.
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
*You may not use this file except in compliance with the License.
* You may not use this file except in compliance with the License.
* A copy of the License is located at
*
* http://aws.amazon.com/apache2.0
*
*or in the "license" file accompanying this file. This file is distributed
*
* or in the "license" file accompanying this file. This file 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.
*/
using Amazon.Runtime;

/*
* Do not modify this file. This file is generated from the s3-2006-03-01.normal.json service model.
*/
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using System.Text;
using System.IO;
using System.Net;

using Amazon.Runtime;
using Amazon.Runtime.Internal;

#pragma warning disable CS0612,CS0618,CS1570
namespace Amazon.S3.Model
{
/// <summary>
/// Container for the parameters to the GetBucketIntelligentTieringConfiguration operation.
/// <note>
/// <para>
/// This operation is not supported by directory buckets.
/// This operation is not supported for directory buckets.
/// </para>
/// </note>
/// <para>
Expand Down Expand Up @@ -53,8 +63,7 @@ namespace Amazon.S3.Model
/// </para>
///
/// <para>
/// Operations related to <code>GetBucketIntelligentTieringConfiguration</code> include:
///
/// Operations related to <c>GetBucketIntelligentTieringConfiguration</c> include:
/// </para>
/// <ul> <li>
/// <para>
Expand All @@ -71,28 +80,37 @@ namespace Amazon.S3.Model
/// <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListBucketIntelligentTieringConfigurations.html">ListBucketIntelligentTieringConfigurations</a>
///
/// </para>
/// </li> </ul>
/// </li> </ul> <important>
/// <para>
/// You must URL encode any signed header values that contain spaces. For example, if
/// your header value is <c>my file.txt</c>, containing two spaces after <c>my</c>, you
/// must URL encode this value to <c>my%20%20file.txt</c>.
/// </para>
/// </important>
/// </summary>
public partial class GetBucketIntelligentTieringConfigurationRequest : AmazonWebServiceRequest
{

private string bucketName;
private string expectedBucketOwner;
private string intelligentTieringId;
{
private string _bucketName;
private string _expectedBucketOwner;
private string _intelligentTieringId;

/// <summary>
/// <para>The name of the Amazon S3 bucket whose configuration you want to modify or retrieve.</para>
/// Gets and sets the property BucketName.
/// <para>
/// The name of the Amazon S3 bucket whose configuration you want to modify or retrieve.
/// </para>
/// </summary>
[AWSProperty(Required=true)]
public string BucketName
{
get { return this.bucketName; }
set { this.bucketName = value; }
get { return this._bucketName; }
set { this._bucketName = value; }
}

// Check to see if BucketName property is set
internal bool IsSetBucketName()
{
return this.BucketName != null;
return this._bucketName != null;
}

/// <summary>
Expand All @@ -105,29 +123,34 @@ internal bool IsSetBucketName()
/// </summary>
public string ExpectedBucketOwner
{
get { return this.expectedBucketOwner; }
set { this.expectedBucketOwner = value; }
get { return this._expectedBucketOwner; }
set { this._expectedBucketOwner = value; }
}

// Check to see if ExpectedBucketOwner property is set
internal bool IsSetExpectedBucketOwner()
{
return this.expectedBucketOwner != null;
return this._expectedBucketOwner != null;
}

/// <summary>
/// <para>The ID used to identify the S3 Intelligent-Tiering configuration.</para>
/// Gets and sets the property IntelligentTieringId.
/// <para>
/// The ID used to identify the S3 Intelligent-Tiering configuration.
/// </para>
/// </summary>
[AWSProperty(Required=true)]
public string IntelligentTieringId
{
get { return this.intelligentTieringId; }
set { this.intelligentTieringId = value; }
{
get { return this._intelligentTieringId; }
set { this._intelligentTieringId = value; }
}

// Check to see if IntelligentTieringId property is set
internal bool IsSetIntelligentTieringId()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not changing this to String.ISNullOREmpty because we check this in the marshaller and will throw an exception if the string is null or empty

{
return !(string.IsNullOrEmpty(this.intelligentTieringId));
return this._intelligentTieringId != null;
}

}
}
}
Loading