Merge pull request #63 from nops-io/aws-release-0.4.1

Aws release 0.4.1
nops-io · Oct 30, 2023 · 04c72cd · 04c72cd
2 parents 106e7fc + e444c0d
commit 04c72cd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 26 deletions.
diff --git a/nops-aws-account-register/Release_Version b/nops-aws-account-register/Release_Version
@@ -1 +1 @@
-v0.4.0
+v0.4.1
diff --git a/...loudformation-org-member-accounts-register/member_consolidated_aws_acc_nops_register.yaml b/...loudformation-org-member-accounts-register/member_consolidated_aws_acc_nops_register.yaml
@@ -15,7 +15,7 @@ Parameters:
 
   pGithubReleaseVersion:
     Type: String
-    Default: v0.4.0
+    Default: v0.4.1
     Description: github release version.
 
 Resources:

diff --git a/nops-aws-account-register/cloudformation-single-acc-register/nops_register_aws_acc.yaml b/nops-aws-account-register/cloudformation-single-acc-register/nops_register_aws_acc.yaml
@@ -9,7 +9,7 @@ Parameters:
 
   s3prefix:
     Type: String
-    Default: something
+    Default: nopsbilling
     Description: nOps daily generated reports folder prefix.
 
   BucketName:
@@ -30,7 +30,7 @@ Parameters:
 
   pGithubReleaseVersion:
     Type: String
-    Default: v0.4.0
+    Default: v0.4.1
     Description: github release version.
 
 Resources:
@@ -237,27 +237,6 @@ Resources:
                 aws:SourceArn: !Sub "arn:aws:cur:${AWS::Region}:${AWS::AccountId}:definition/*"
                 aws:SourceAccount: !Sub "${AWS::AccountId}"
 
-  nopsReportDefinition:
-    Type: AWS::CUR::ReportDefinition
-    DependsOn:
-      - nopsBucketForLogs
-      - BucketPolicy
-    Properties:
-      AdditionalArtifacts:
-        - "REDSHIFT"
-        - "QUICKSIGHT"
-      AdditionalSchemaElements:
-        - "RESOURCES"
-      Compression: "GZIP"
-      RefreshClosedReports: true
-      Format: "textORcsv"
-      ReportName: !Ref ReportName
-      ReportVersioning: "OVERWRITE_REPORT"
-      S3Bucket: !Ref nopsBucketForLogs
-      S3Prefix: !Ref s3prefix
-      S3Region: !Sub "${AWS::Region}"
-      TimeUnit: "DAILY"
-
   nopsLambdaExecutionRole:
     Type: "AWS::IAM::Role"
     Properties:
@@ -293,7 +272,7 @@ Resources:
       Role: !GetAtt nopsLambdaExecutionRole.Arn
       Runtime: "python3.9"
       Timeout: 150
-      FunctionName: "generate-external-id"
+      FunctionName: "nops-generate-external-id-${AWS::Region}"
     DependsOn:
       - nopsLambdaExecutionRole
       - rTriggerCopyAccRegPackage