Merge pull request #30 from srinivasreddych/feat/metadata

Feat/metadata
awslabs · Jul 25, 2023 · cd9aaf6 · cd9aaf6
2 parents db25d58 + d19ee09
commit cd9aaf6
Show file tree

Hide file tree

Showing 32 changed files with 25 additions and 556 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### **Changed**
 
+- replaced exporting metadata with seedfarmer command
+
 ### **Removed**
 
 =======

diff --git a/modules/compute/aws-batch/deployspec.yaml b/modules/compute/aws-batch/deployspec.yaml
@@ -12,8 +12,8 @@ deploy:
       - aws iam create-service-linked-role --aws-service-name spot.amazonaws.com || true
       - aws iam create-service-linked-role --aws-service-name spotfleet.amazonaws.com || true
       - cdk deploy --require-approval never --progress events --app "python app.py" --outputs-file ./cdk-exports.json
-      # Here we export some env vars
-      - python export_metadata.py
+      # Export metadata
+      - seedfarmer metadata convert -f cdk-exports.json || true
 destroy:
   phases:
     install:

diff --git a/modules/compute/aws-batch/export_metadata.py b/modules/compute/aws-batch/export_metadata.py
diff --git a/modules/compute/aws-batch/tests/test_exportdata.py b/modules/compute/aws-batch/tests/test_exportdata.py
diff --git a/modules/compute/emr-serverless/deployspec.yaml b/modules/compute/emr-serverless/deployspec.yaml
@@ -9,7 +9,8 @@ deploy:
       commands:
       - aws iam create-service-linked-role --aws-service-name ops.emr-serverless.amazonaws.com || true
       - cdk deploy --require-approval never --progress events --app "python app.py" --outputs-file ./cdk-exports.json
-      - python export_metadata.py
+      # Export metadata
+      - seedfarmer metadata convert -f cdk-exports.json || true
 destroy:
   phases:
     install:

diff --git a/modules/compute/emr-serverless/export_metadata.py b/modules/compute/emr-serverless/export_metadata.py
diff --git a/modules/compute/emr-serverless/tests/test_exportdata.py b/modules/compute/emr-serverless/tests/test_exportdata.py
diff --git a/modules/database/neptune/deployspec.yaml b/modules/database/neptune/deployspec.yaml
@@ -8,8 +8,8 @@ deploy:
     build:
       commands:
       - cdk deploy --require-approval never --progress events --app "python app.py" --outputs-file ./cdk-exports.json
-      # Here we export some env vars
-      - python export_metadata.py
+      # Export metadata
+      - seedfarmer metadata convert -f cdk-exports.json || true
 destroy:
   phases:
     install:

diff --git a/modules/database/neptune/export_metadata.py b/modules/database/neptune/export_metadata.py
diff --git a/modules/database/neptune/tests/test_exportdata.py b/modules/database/neptune/tests/test_exportdata.py
diff --git a/modules/dummy/blank/deployspec.yaml b/modules/dummy/blank/deployspec.yaml
@@ -9,7 +9,8 @@ deploy:
     build:
       commands:
       - echo "This Dummy Module does nothing"
-      - python export_metadata.py
+      # Export metadata
+      # - seedfarmer metadata convert -f cdk-exports.json || true
 destroy:
   phases:
     install:

diff --git a/modules/dummy/blank/export_metadata.py b/modules/dummy/blank/export_metadata.py
diff --git a/modules/network/basic-cdk/deployspec.yaml b/modules/network/basic-cdk/deployspec.yaml
@@ -10,8 +10,8 @@ deploy:
       commands:
       # execute the CDK
       - cdk deploy --require-approval never --progress events --app "python app.py" --outputs-file ./cdk-exports.json
-      # get the cdk.output and write to a file named <project>_MODULE_METADATA --- ALL UPPERCASE AND '_'
-      - python export_metadata.py
+      # Export metadata
+      - seedfarmer metadata convert -f cdk-exports.json || true
 destroy:
   phases:
     install:

diff --git a/modules/network/basic-cdk/export_metadata.py b/modules/network/basic-cdk/export_metadata.py
diff --git a/modules/network/basic-cdk/tests/test_exportdata.py b/modules/network/basic-cdk/tests/test_exportdata.py
diff --git a/modules/orchestration/mwaa/deployspec.yaml b/modules/orchestration/mwaa/deployspec.yaml
@@ -19,8 +19,8 @@ deploy:
       - echo "Moving ${REQUIREMENTS_FILE} to ${UNIQUE_REQUIREMENTS_FILE}"
       - mv ${REQUIREMENTS_FILE} ${UNIQUE_REQUIREMENTS_FILE}
       - cdk deploy --require-approval never --progress events --app "python app.py" --outputs-file ./cdk-exports.json
-      # # Here we export some env vars
-      - python export_metadata.py
+      # Export metadata
+      - seedfarmer metadata convert -f cdk-exports.json || true
 destroy:
   phases:
     install:

diff --git a/modules/orchestration/mwaa/export_metadata.py b/modules/orchestration/mwaa/export_metadata.py
diff --git a/modules/orchestration/mwaa/stack.py b/modules/orchestration/mwaa/stack.py
@@ -84,6 +84,7 @@ def __init__(
             dag_bucket = aws_s3.Bucket(
                 self,
                 id="airflow-dag-bucket",
+                versioned=True,
                 bucket_name=f"{dep_mod}-{account}-{region}",
                 removal_policy=aws_cdk.RemovalPolicy.DESTROY,
                 encryption=aws_s3.BucketEncryption.KMS_MANAGED,

diff --git a/modules/orchestration/mwaa/tests/test_exportdata.py b/modules/orchestration/mwaa/tests/test_exportdata.py