Skip to content

Commit 4738564

Browse files
cmperrowmudge
authored andcommitted
Remove AWS DynamoDB references (#23)
Signed-off-by: Chris Perro <cmperro@gmail.com>
1 parent 6eb7374 commit 4738564

File tree

1 file changed

+2
-22
lines changed

1 file changed

+2
-22
lines changed

plugins/modules/env.py

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,6 @@
240240
default: 3600
241241
aliases:
242242
- polling_timeout
243-
s3_guard_name:
244-
description:
245-
- (AWS) AWS Dynamo table name for S3 Guard.
246-
type: str
247-
required: False
248-
aliases:
249-
- s3_guard
250-
- s3_guard_table_name
251243
endpoint_access_scheme:
252244
description:
253245
- (AWS)The scheme for the workload endpoint gateway. PUBLIC creates an external endpoint that can be accessed over the Internet.
@@ -351,16 +343,6 @@
351343
type: str
352344
returned: when supported
353345
sample: a_labeled_public_key
354-
awsDetails:
355-
description: AWS-specific environment configuration information.
356-
returned: when supported
357-
type: dict
358-
contains:
359-
s3GuardTableName:
360-
description: The name for the DynamoDB table backing S3Guard.
361-
type: str
362-
returned: always
363-
sample: table_name
364346
cloudPlatform:
365347
description: Cloud provider of the Environment.
366348
returned: always
@@ -872,7 +854,8 @@ def _configure_payload(self):
872854
payload['proxyConfigName'] = self.proxy
873855

874856
if self.s3_guard_name is not None:
875-
payload['s3GuardTableName'] = self.s3_guard_name
857+
self.module.warn('As of CDP Runtime 7.2.10 (and given consistent s3), s3Guard is no longer needed. '
858+
'Proceeding without s3Guard.')
876859

877860
if self.inbound_cidr is not None:
878861
payload['securityAccess'] = dict(cidr=self.inbound_cidr)
@@ -957,9 +940,6 @@ def _reconcile_existing_state(self, existing):
957940
if self.network_cidr is not None and existing['network']['networkCidr'] != self.network_cidr:
958941
mismatch.append(['network_cidr', existing['network']['networkCidr']])
959942

960-
if self.s3_guard_name is not None and existing['awsDetails']['s3GuardTableName'] != self.s3_guard_name:
961-
mismatch.append(['s3_guard_name', existing['awsDetails']['s3GuardTableName']])
962-
963943
if self.inbound_cidr is not None and existing['securityAccess']['cidr'] != self.inbound_cidr:
964944
mismatch.append(['inbound_cidr', existing['securityAccess']['cidr']])
965945

0 commit comments

Comments
 (0)