Skip to content

Commit

Permalink
Merge branch 'release-1.35.90' into develop
Browse files Browse the repository at this point in the history 
* release-1.35.90:
  Bumping version to 1.35.90
  Update to latest models
  • Loading branch information
@aws-sdk-python-automation
aws-sdk-python-automation committed Dec 28, 2024
2 parents 5094241 + 5093c63 commit fc7208d
Show file tree
Hide file tree
Showing 8 changed files with 1,372 additions and 220 deletions.
12 changes: 12 additions & 0 deletions .changes/1.35.90.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"category": "``ecr``",
"description": "Restoring custom endpoint functionality for ECR",
"type": "api-change"
},
{
"category": "``ecr-public``",
"description": "Restoring custom endpoint functionality for ECR Public",
"type": "api-change"
}
]
7 changes: 7 additions & 0 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
CHANGELOG
=========

1.35.90
=======

* api-change:``ecr``: Restoring custom endpoint functionality for ECR
* api-change:``ecr-public``: Restoring custom endpoint functionality for ECR Public


1.35.89
=======

Expand Down
2 changes: 1 addition & 1 deletion botocore/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import os
import re

__version__ = '1.35.89'
__version__ = '1.35.90'


class NullHandler(logging.Handler):
Expand Down
263 changes: 225 additions & 38 deletions botocore/data/ecr-public/2020-10-30/endpoint-rule-set-1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,25 @@
"documentation": "The AWS region used to dispatch the request.",
"type": "String"
},
"UseFIPS": {
"builtIn": "AWS::UseFIPS",
"UseDualStack": {
"builtIn": "AWS::UseDualStack",
"required": true,
"default": false,
"documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.",
"documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.",
"type": "Boolean"
},
"UseDualStack": {
"builtIn": "AWS::UseDualStack",
"UseFIPS": {
"builtIn": "AWS::UseFIPS",
"required": true,
"default": false,
"documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.",
"documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.",
"type": "Boolean"
},
"Endpoint": {
"builtIn": "SDK::Endpoint",
"required": false,
"documentation": "Override the endpoint used to send this request",
"type": "String"
}
},
"rules": [
Expand All @@ -29,18 +35,9 @@
"fn": "isSet",
"argv": [
{
"ref": "Region"
"ref": "Endpoint"
}
]
},
{
"fn": "aws.partition",
"argv": [
{
"ref": "Region"
}
],
"assign": "PartitionResult"
}
],
"rules": [
Expand All @@ -56,7 +53,7 @@
]
}
],
"error": "ECR Public does not support FIPS",
"error": "Invalid Configuration: FIPS and custom endpoint are not supported",
"type": "error"
},
{
Expand All @@ -71,57 +68,247 @@
]
}
],
"error": "Invalid Configuration: Dualstack and custom endpoint are not supported",
"type": "error"
},
{
"conditions": [],
"endpoint": {
"url": {
"ref": "Endpoint"
},
"properties": {},
"headers": {}
},
"type": "endpoint"
}
],
"type": "tree"
},
{
"conditions": [
{
"fn": "isSet",
"argv": [
{
"ref": "Region"
}
]
}
],
"rules": [
{
"conditions": [
{
"fn": "aws.partition",
"argv": [
{
"ref": "Region"
}
],
"assign": "PartitionResult"
}
],
"rules": [
{
"conditions": [
{
"fn": "booleanEquals",
"argv": [
true,
{
"fn": "getAttr",
"ref": "UseFIPS"
},
true
]
},
{
"fn": "booleanEquals",
"argv": [
{
"ref": "UseDualStack"
},
true
]
}
],
"rules": [
{
"conditions": [
{
"fn": "booleanEquals",
"argv": [
true,
{
"ref": "PartitionResult"
"fn": "getAttr",
"argv": [
{
"ref": "PartitionResult"
},
"supportsFIPS"
]
}
]
},
{
"fn": "booleanEquals",
"argv": [
true,
{
"fn": "getAttr",
"argv": [
{
"ref": "PartitionResult"
},
"supportsDualStack"
]
}
]
}
],
"rules": [
{
"conditions": [],
"endpoint": {
"url": "https://api.ecr-public-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
"properties": {},
"headers": {}
},
"type": "endpoint"
}
],
"type": "tree"
},
{
"conditions": [],
"error": "FIPS and DualStack are enabled, but this partition does not support one or both",
"type": "error"
}
],
"type": "tree"
},
{
"conditions": [
{
"fn": "booleanEquals",
"argv": [
{
"ref": "UseFIPS"
},
true
]
}
],
"rules": [
{
"conditions": [
{
"fn": "booleanEquals",
"argv": [
{
"fn": "getAttr",
"argv": [
{
"ref": "PartitionResult"
},
"supportsFIPS"
]
},
"supportsDualStack"
true
]
}
],
"rules": [
{
"conditions": [],
"endpoint": {
"url": "https://api.ecr-public-fips.{Region}.{PartitionResult#dnsSuffix}",
"properties": {},
"headers": {}
},
"type": "endpoint"
}
],
"type": "tree"
},
{
"conditions": [],
"error": "FIPS is enabled but this partition does not support FIPS",
"type": "error"
}
],
"type": "tree"
},
{
"conditions": [
{
"fn": "booleanEquals",
"argv": [
{
"ref": "UseDualStack"
},
true
]
}
],
"rules": [
{
"conditions": [
{
"fn": "booleanEquals",
"argv": [
true,
{
"fn": "getAttr",
"argv": [
{
"ref": "PartitionResult"
},
"supportsDualStack"
]
}
]
}
],
"rules": [
{
"conditions": [],
"endpoint": {
"url": "https://api.ecr-public.{Region}.{PartitionResult#dualStackDnsSuffix}",
"properties": {},
"headers": {}
},
"type": "endpoint"
}
],
"type": "tree"
},
{
"conditions": [],
"endpoint": {
"url": "https://ecr-public.{Region}.{PartitionResult#dualStackDnsSuffix}",
"properties": {},
"headers": {}
},
"type": "endpoint"
"error": "DualStack is enabled but this partition does not support DualStack",
"type": "error"
}
],
"type": "tree"
},
{
"conditions": [],
"error": "Dualstack is enabled but this partition does not support dualstack",
"type": "error"
"endpoint": {
"url": "https://api.ecr-public.{Region}.{PartitionResult#dnsSuffix}",
"properties": {},
"headers": {}
},
"type": "endpoint"
}
],
"type": "tree"
},
{
"conditions": [],
"endpoint": {
"url": "https://api.ecr-public.{Region}.{PartitionResult#dnsSuffix}",
"properties": {},
"headers": {}
},
"type": "endpoint"
}
],
"type": "tree"
},
{
"conditions": [],
"error": "Invalid Configuration: Missing Region",
"type": "error"
}
]
}
Loading

0 comments on commit fc7208d

Please sign in to comment.