-
Notifications
You must be signed in to change notification settings - Fork 6
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.
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
refactor(GuLogShippingPolicy)!: make GuLogShippingPolicy a singleton #337
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
import type { GuStack } from "../stack"; | ||
import { GuStringParameter } from "./base"; | ||
|
||
export class GuLoggingStreamNameParameter extends GuStringParameter { | ||
private static instance: GuStringParameter | undefined; | ||
|
||
// eslint-disable-next-line custom-rules/valid-constructors -- TODO be better | ||
private constructor(scope: GuStack) { | ||
super(scope, "LoggingStreamName", { | ||
description: "SSM parameter containing the Name (not ARN) on the kinesis stream", | ||
default: "/account/services/logging.stream.name", | ||
fromSSM: true, | ||
}); | ||
} | ||
|
||
public static getInstance(stack: GuStack): GuLoggingStreamNameParameter { | ||
// Resources can only live in the same App so return a new `GuSSMRunCommandPolicy` where necessary. | ||
// See https://github.com/aws/aws-cdk/blob/0ea4b19afd639541e5f1d7c1783032ee480c307e/packages/%40aws-cdk/core/lib/private/refs.ts#L47-L50 | ||
const isSameStack = this.instance?.node.root === stack.node.root; | ||
|
||
if (!this.instance || !isSameStack) { | ||
this.instance = new GuLoggingStreamNameParameter(stack); | ||
} | ||
|
||
return this.instance; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,17 @@ | ||
import { Effect, PolicyStatement } from "@aws-cdk/aws-iam"; | ||
import type { GuStack } from "../../core"; | ||
import { GuStringParameter } from "../../core"; | ||
import type { GuPolicyProps } from "./base-policy"; | ||
import { GuPolicy } from "./base-policy"; | ||
import { GuLoggingStreamNameParameter } from "../../core/parameters/log-shipping"; | ||
import { GuAllowPolicy } from "./base-policy"; | ||
|
||
export class GuLogShippingPolicy extends GuPolicy { | ||
constructor(scope: GuStack, id: string = "GuLogShippingPolicy", props?: GuPolicyProps) { | ||
super(scope, id, { ...props }); | ||
|
||
const loggingStreamNameParam = new GuStringParameter(scope, "LoggingStreamName", { | ||
description: "SSM parameter containing the Name (not ARN) on the kinesis stream", | ||
default: "/account/services/logging.stream.name", | ||
fromSSM: true, | ||
export class GuLogShippingPolicy extends GuAllowPolicy { | ||
// eslint-disable-next-line custom-rules/valid-constructors -- TODO be better | ||
constructor(scope: GuStack) { | ||
super(scope, "GuLogShippingPolicy", { | ||
actions: ["kinesis:Describe*", "kinesis:Put*"], | ||
resources: [ | ||
`arn:aws:kinesis:${scope.region}:${scope.account}:stream/${ | ||
GuLoggingStreamNameParameter.getInstance(scope).valueAsString | ||
}`, | ||
], | ||
}); | ||
|
||
this.addStatements( | ||
new PolicyStatement({ | ||
effect: Effect.ALLOW, | ||
actions: ["kinesis:Describe*", "kinesis:Put*"], | ||
resources: [`arn:aws:kinesis:${scope.region}:${scope.account}:stream/${loggingStreamNameParam.valueAsString}`], | ||
}) | ||
); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.