Skip to content

Commit 1fb54c0

Browse files
CloudWatch Logs updates: Added X-Ray tracing for Amazon Bedrock Agent resources. Logs introduced Log Group level resource policies (managed through Put/Delete/Describe Resource Policy APIs). For more information, see CloudWatch Logs API documentation.
1 parent 905c4bc commit 1fb54c0

34 files changed

+698
-120
lines changed

generator/ServiceModels/logs/logs-2014-03-28.api.json

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@
337337
"errors":[
338338
{"shape":"InvalidParameterException"},
339339
{"shape":"ResourceNotFoundException"},
340+
{"shape":"OperationAbortedException"},
340341
{"shape":"ServiceUnavailableException"}
341342
]
342343
},
@@ -1115,6 +1116,8 @@
11151116
"errors":[
11161117
{"shape":"InvalidParameterException"},
11171118
{"shape":"LimitExceededException"},
1119+
{"shape":"OperationAbortedException"},
1120+
{"shape":"ResourceNotFoundException"},
11181121
{"shape":"ServiceUnavailableException"}
11191122
]
11201123
},
@@ -1878,7 +1881,9 @@
18781881
"DeleteResourcePolicyRequest":{
18791882
"type":"structure",
18801883
"members":{
1881-
"policyName":{"shape":"PolicyName"}
1884+
"policyName":{"shape":"PolicyName"},
1885+
"resourceArn":{"shape":"Arn"},
1886+
"expectedRevisionId":{"shape":"ExpectedRevisionId"}
18821887
}
18831888
},
18841889
"DeleteRetentionPolicyRequest":{
@@ -1969,13 +1974,14 @@
19691974
"enum":[
19701975
"S3",
19711976
"CWL",
1972-
"FH"
1977+
"FH",
1978+
"XRAY"
19731979
]
19741980
},
19751981
"DeliveryDestinationTypes":{
19761982
"type":"list",
19771983
"member":{"shape":"DeliveryDestinationType"},
1978-
"max":3,
1984+
"max":4,
19791985
"min":1
19801986
},
19811987
"DeliveryDestinations":{
@@ -2275,7 +2281,9 @@
22752281
"type":"structure",
22762282
"members":{
22772283
"nextToken":{"shape":"NextToken"},
2278-
"limit":{"shape":"DescribeLimit"}
2284+
"limit":{"shape":"DescribeLimit"},
2285+
"resourceArn":{"shape":"Arn"},
2286+
"policyScope":{"shape":"PolicyScope"}
22792287
}
22802288
},
22812289
"DescribeResourcePoliciesResponse":{
@@ -2471,6 +2479,10 @@
24712479
"max":10000,
24722480
"min":1
24732481
},
2482+
"ExpectedRevisionId":{
2483+
"type":"string",
2484+
"min":1
2485+
},
24742486
"ExportDestinationBucket":{
24752487
"type":"string",
24762488
"max":512,
@@ -3748,6 +3760,13 @@
37483760
"min":1
37493761
},
37503762
"PolicyName":{"type":"string"},
3763+
"PolicyScope":{
3764+
"type":"string",
3765+
"enum":[
3766+
"ACCOUNT",
3767+
"RESOURCE"
3768+
]
3769+
},
37513770
"PolicyType":{
37523771
"type":"string",
37533772
"enum":[
@@ -3854,14 +3873,12 @@
38543873
},
38553874
"PutDeliveryDestinationRequest":{
38563875
"type":"structure",
3857-
"required":[
3858-
"name",
3859-
"deliveryDestinationConfiguration"
3860-
],
3876+
"required":["name"],
38613877
"members":{
38623878
"name":{"shape":"DeliveryDestinationName"},
38633879
"outputFormat":{"shape":"OutputFormat"},
38643880
"deliveryDestinationConfiguration":{"shape":"DeliveryDestinationConfiguration"},
3881+
"deliveryDestinationType":{"shape":"DeliveryDestinationType"},
38653882
"tags":{"shape":"Tags"}
38663883
}
38673884
},
@@ -4027,13 +4044,16 @@
40274044
"type":"structure",
40284045
"members":{
40294046
"policyName":{"shape":"PolicyName"},
4030-
"policyDocument":{"shape":"PolicyDocument"}
4047+
"policyDocument":{"shape":"PolicyDocument"},
4048+
"resourceArn":{"shape":"Arn"},
4049+
"expectedRevisionId":{"shape":"ExpectedRevisionId"}
40314050
}
40324051
},
40334052
"PutResourcePolicyResponse":{
40344053
"type":"structure",
40354054
"members":{
4036-
"resourcePolicy":{"shape":"ResourcePolicy"}
4055+
"resourcePolicy":{"shape":"ResourcePolicy"},
4056+
"revisionId":{"shape":"ExpectedRevisionId"}
40374057
}
40384058
},
40394059
"PutRetentionPolicyRequest":{
@@ -4285,7 +4305,10 @@
42854305
"members":{
42864306
"policyName":{"shape":"PolicyName"},
42874307
"policyDocument":{"shape":"PolicyDocument"},
4288-
"lastUpdatedTime":{"shape":"Timestamp"}
4308+
"lastUpdatedTime":{"shape":"Timestamp"},
4309+
"policyScope":{"shape":"PolicyScope"},
4310+
"resourceArn":{"shape":"Arn"},
4311+
"revisionId":{"shape":"ExpectedRevisionId"}
42894312
}
42904313
},
42914314
"ResourceType":{

generator/ServiceModels/logs/logs-2014-03-28.docs.json

Lines changed: 36 additions & 15 deletions
Large diffs are not rendered by default.

generator/ServiceModels/logs/logs-2014-03-28.normal.json

Lines changed: 75 additions & 19 deletions
Large diffs are not rendered by default.

sdk/code-analysis/ServiceAnalysis/CloudWatchLogs/Generated/PropertyValueRules.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,10 @@
201201
<min>1</min>
202202
<max>256</max>
203203
</property-value-rule>
204+
<property-value-rule>
205+
<property>Amazon.CloudWatchLogs.Model.DeleteResourcePolicyRequest.ExpectedRevisionId</property>
206+
<min>1</min>
207+
</property-value-rule>
204208
<property-value-rule>
205209
<property>Amazon.CloudWatchLogs.Model.DeleteRetentionPolicyRequest.LogGroupName</property>
206210
<min>1</min>
@@ -984,11 +988,19 @@
984988
<min>1</min>
985989
<max>256</max>
986990
</property-value-rule>
991+
<property-value-rule>
992+
<property>Amazon.CloudWatchLogs.Model.PutResourcePolicyRequest.ExpectedRevisionId</property>
993+
<min>1</min>
994+
</property-value-rule>
987995
<property-value-rule>
988996
<property>Amazon.CloudWatchLogs.Model.PutResourcePolicyRequest.PolicyDocument</property>
989997
<min>1</min>
990998
<max>5120</max>
991999
</property-value-rule>
1000+
<property-value-rule>
1001+
<property>Amazon.CloudWatchLogs.Model.PutResourcePolicyResponse.RevisionId</property>
1002+
<min>1</min>
1003+
</property-value-rule>
9921004
<property-value-rule>
9931005
<property>Amazon.CloudWatchLogs.Model.PutRetentionPolicyRequest.LogGroupName</property>
9941006
<min>1</min>
@@ -1893,6 +1905,10 @@
18931905
<min>1</min>
18941906
<max>5120</max>
18951907
</property-value-rule>
1908+
<property-value-rule>
1909+
<property>Amazon.CloudWatchLogs.Model.ResourcePolicy.RevisionId</property>
1910+
<min>1</min>
1911+
</property-value-rule>
18961912
<property-value-rule>
18971913
<property>Amazon.CloudWatchLogs.Model.S3DeliveryConfiguration.SuffixPath</property>
18981914
<min>1</min>

sdk/src/Services/CloudWatchLogs/Generated/Model/CreateDeliveryRequest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace Amazon.CloudWatchLogs.Model
4444
///
4545
/// <para>
4646
/// A delivery destination can represent a log group in CloudWatch Logs, an Amazon S3
47-
/// bucket, or a delivery stream in Firehose.
47+
/// bucket, a delivery stream in Firehose, or X-Ray.
4848
/// </para>
4949
///
5050
/// <para>

sdk/src/Services/CloudWatchLogs/Generated/Model/DeleteDeliveryDestinationRequest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public partial class DeleteDeliveryDestinationRequest : AmazonCloudWatchLogsRequ
5050
/// Gets and sets the property Name.
5151
/// <para>
5252
/// The name of the delivery destination that you want to delete. You can find a list
53-
/// of delivery destionation names by using the <a href="https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_DescribeDeliveryDestinations.html">DescribeDeliveryDestinations</a>
53+
/// of delivery destination names by using the <a href="https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_DescribeDeliveryDestinations.html">DescribeDeliveryDestinations</a>
5454
/// operation.
5555
/// </para>
5656
/// </summary>

sdk/src/Services/CloudWatchLogs/Generated/Model/DeleteResourcePolicyRequest.cs

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,29 @@ namespace Amazon.CloudWatchLogs.Model
3636
/// </summary>
3737
public partial class DeleteResourcePolicyRequest : AmazonCloudWatchLogsRequest
3838
{
39+
private string _expectedRevisionId;
3940
private string _policyName;
41+
private string _resourceArn;
42+
43+
/// <summary>
44+
/// Gets and sets the property ExpectedRevisionId.
45+
/// <para>
46+
/// The expected revision ID of the resource policy. Required when deleting a resource-scoped
47+
/// policy to prevent concurrent modifications.
48+
/// </para>
49+
/// </summary>
50+
[AWSProperty(Min=1)]
51+
public string ExpectedRevisionId
52+
{
53+
get { return this._expectedRevisionId; }
54+
set { this._expectedRevisionId = value; }
55+
}
56+
57+
// Check to see if ExpectedRevisionId property is set
58+
internal bool IsSetExpectedRevisionId()
59+
{
60+
return this._expectedRevisionId != null;
61+
}
4062

4163
/// <summary>
4264
/// Gets and sets the property PolicyName.
@@ -56,5 +78,24 @@ internal bool IsSetPolicyName()
5678
return this._policyName != null;
5779
}
5880

81+
/// <summary>
82+
/// Gets and sets the property ResourceArn.
83+
/// <para>
84+
/// The ARN of the CloudWatch Logs resource for which the resource policy needs to be
85+
/// deleted
86+
/// </para>
87+
/// </summary>
88+
public string ResourceArn
89+
{
90+
get { return this._resourceArn; }
91+
set { this._resourceArn = value; }
92+
}
93+
94+
// Check to see if ResourceArn property is set
95+
internal bool IsSetResourceArn()
96+
{
97+
return this._resourceArn != null;
98+
}
99+
59100
}
60101
}

sdk/src/Services/CloudWatchLogs/Generated/Model/Delivery.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ internal bool IsSetDeliveryDestinationArn()
9898
/// Gets and sets the property DeliveryDestinationType.
9999
/// <para>
100100
/// Displays whether the delivery destination associated with this delivery is CloudWatch
101-
/// Logs, Amazon S3, or Firehose.
101+
/// Logs, Amazon S3, Firehose, or X-Ray.
102102
/// </para>
103103
/// </summary>
104104
public DeliveryDestinationType DeliveryDestinationType

sdk/src/Services/CloudWatchLogs/Generated/Model/DeliveryDestination.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace Amazon.CloudWatchLogs.Model
3333
/// This structure contains information about one <i>delivery destination</i> in your
3434
/// account. A delivery destination is an Amazon Web Services resource that represents
3535
/// an Amazon Web Services service that logs can be sent to. CloudWatch Logs, Amazon S3,
36-
/// are supported as Firehose delivery destinations.
36+
/// Firehose, and X-Ray are supported as delivery destinations.
3737
///
3838
///
3939
/// <para>
@@ -117,7 +117,8 @@ internal bool IsSetDeliveryDestinationConfiguration()
117117
/// <summary>
118118
/// Gets and sets the property DeliveryDestinationType.
119119
/// <para>
120-
/// Displays whether this delivery destination is CloudWatch Logs, Amazon S3, or Firehose.
120+
/// Displays whether this delivery destination is CloudWatch Logs, Amazon S3, Firehose,
121+
/// or X-Ray.
121122
/// </para>
122123
/// </summary>
123124
public DeliveryDestinationType DeliveryDestinationType

sdk/src/Services/CloudWatchLogs/Generated/Model/DescribeConfigurationTemplatesRequest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public partial class DescribeConfigurationTemplatesRequest : AmazonCloudWatchLog
5151
/// that apply to the delivery destination types that you specify here.
5252
/// </para>
5353
/// </summary>
54-
[AWSProperty(Min=1, Max=3)]
54+
[AWSProperty(Min=1, Max=4)]
5555
public List<string> DeliveryDestinationTypes
5656
{
5757
get { return this._deliveryDestinationTypes; }

0 commit comments

Comments
 (0)