Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #64

Merged
merged 8 commits into from
Oct 30, 2023
Merged

Release #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1cdb122
Update nops_register_aws_acc.yaml
mk-th Oct 30, 2023
fbddf17
Update nops_register_aws_acc.yaml
mk-th Oct 30, 2023
542d1cb
Update nops_register_aws_acc.yaml
mk-th Oct 30, 2023
91085dd
Update nops_register_aws_acc.yaml
mk-th Oct 30, 2023
e4e7a5f
Update Release_Version
mk-th Oct 30, 2023
7ff2827
Update nops_register_aws_acc.yaml
mk-th Oct 30, 2023
e444c0d
Update member_consolidated_aws_acc_nops_register.yaml
mk-th Oct 30, 2023
04c72cd
Merge pull request #63 from nops-io/aws-release-0.4.1
mk-th Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nops-aws-account-register/Release_Version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.4.0
v0.4.1
2 changes: 1 addition & 1 deletion ...loudformation-org-member-accounts-register/member_consolidated_aws_acc_nops_register.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Parameters:

pGithubReleaseVersion:
Type: String
Default: v0.4.0
Default: v0.4.1
Description: github release version.

Resources:
Expand Down
27 changes: 3 additions & 24 deletions nops-aws-account-register/cloudformation-single-acc-register/nops_register_aws_acc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Parameters:

s3prefix:
Type: String
Default: something
Default: nopsbilling
Description: nOps daily generated reports folder prefix.

BucketName:
Expand All @@ -30,7 +30,7 @@ Parameters:

pGithubReleaseVersion:
Type: String
Default: v0.4.0
Default: v0.4.1
Description: github release version.

Resources:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Loading