Repository navigation
feat(postgres): add create/update mutations and reuse live personal access #535
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 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 hidden or 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 hidden or 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 hidden or 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
12 changes: 12 additions & 0 deletions
12
integration_tests/k8s_resources/postgres_crud/dev/pg-crud-team/postgres.yaml
This file contains hidden or 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,12 @@ | ||
| apiVersion: nais.io/v1 | ||
| kind: Postgres | ||
| metadata: | ||
| name: existing | ||
| namespace: pg-crud-team | ||
| spec: | ||
| majorVersion: "17" | ||
| highAvailability: false | ||
| resources: | ||
| cpu: 100m | ||
| memory: 512Mi | ||
| diskSize: 10Gi |
This file contains hidden or 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,177 @@ | ||
| local member = User.new("postgres-crud-user", "postgres-crud-user@usersen.com") | ||
| local outsider = User.new("postgres-crud-outsider", "postgres-crud-outsider@usersen.com") | ||
| local team = Team.new("pg-crud-team", "Testing Postgres create and update", "#postgres-crud") | ||
| team:addMember(member) | ||
| Helper.readK8sResources("k8s_resources/postgres_crud") | ||
|
|
||
| local function create(name, extra) | ||
| return string.format( | ||
| [[mutation { createPostgres(input: { | ||
| name: "%s", environmentName: "dev", teamSlug: "pg-crud-team", %s | ||
| }) { postgres { name majorVersion highAvailability resources { cpu memory diskSize } } } }]], | ||
| name, | ||
| extra | ||
| ) | ||
| end | ||
|
|
||
| Test.gql("Non-members cannot create Postgres", function(t) | ||
| t.addHeader("x-user-email", outsider:email()) | ||
| t.query(create("denied", 'majorVersion: "18"')) | ||
| t.check { | ||
| errors = { { locations = NotNull(), path = { "createPostgres" }, message = Contains("You are authenticated") } }, | ||
| data = Null, | ||
| } | ||
| end) | ||
|
|
||
| Test.gql("Team members can create Postgres with defaults left to the platform", function(t) | ||
| t.addHeader("x-user-email", member:email()) | ||
| t.query(create("fresh", 'majorVersion: "18"')) | ||
| t.check { | ||
| data = { | ||
| createPostgres = { | ||
| postgres = { | ||
| name = "fresh", | ||
| majorVersion = "18", | ||
| highAvailability = false, | ||
| resources = { cpu = Null, memory = Null, diskSize = Null }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| end) | ||
|
|
||
| Test.gql("Team members can create Postgres with explicit resources", function(t) | ||
| t.addHeader("x-user-email", member:email()) | ||
| t.query(create("sized", 'majorVersion: "18", highAvailability: true, cpu: "250m", memory: "1Gi", diskSize: "20Gi"')) | ||
| t.check { | ||
| data = { | ||
| createPostgres = { | ||
| postgres = { | ||
| name = "sized", | ||
| majorVersion = "18", | ||
| highAvailability = true, | ||
| resources = { cpu = "250m", memory = "1Gi", diskSize = "20Gi" }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| end) | ||
|
|
||
| Test.gql("Creating an existing Postgres fails", function(t) | ||
| t.addHeader("x-user-email", member:email()) | ||
| t.query(create("existing", 'majorVersion: "18"')) | ||
| t.check { | ||
| errors = { { locations = NotNull(), path = { "createPostgres" }, message = NotNull() } }, | ||
| data = Null, | ||
| } | ||
| end) | ||
|
|
||
| Test.gql("Unsupported major version is rejected", function(t) | ||
| t.addHeader("x-user-email", member:email()) | ||
| t.query(create("badversion", 'majorVersion: "9"')) | ||
| t.check { | ||
| errors = { { extensions = { field = "majorVersion" }, path = { "createPostgres" }, message = Contains("Major version must be one of") } }, | ||
| data = Null, | ||
| } | ||
| end) | ||
|
|
||
| Test.gql("Invalid resource quantity is rejected", function(t) | ||
| t.addHeader("x-user-email", member:email()) | ||
| t.query(create("badquantity", 'majorVersion: "18", cpu: "lots"')) | ||
| t.check { | ||
| errors = { { extensions = { field = "cpu" }, path = { "createPostgres" }, message = Contains("is not a valid quantity") } }, | ||
| data = Null, | ||
| } | ||
| end) | ||
|
|
||
| Test.gql("Team members can update only the fields they provide", function(t) | ||
| t.addHeader("x-user-email", member:email()) | ||
| t.query [[mutation { updatePostgres(input: { | ||
| name: "existing", environmentName: "dev", teamSlug: "pg-crud-team", highAvailability: true, diskSize: "30Gi" | ||
| }) { postgres { majorVersion highAvailability resources { cpu memory diskSize } } } }]] | ||
| t.check { | ||
| data = { | ||
| updatePostgres = { | ||
| postgres = { | ||
| majorVersion = "17", | ||
| highAvailability = true, | ||
| resources = { cpu = "100m", memory = "512Mi", diskSize = "30Gi" }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| end) | ||
|
|
||
| Test.gql("Non-members cannot update Postgres", function(t) | ||
| t.addHeader("x-user-email", outsider:email()) | ||
| t.query [[mutation { updatePostgres(input: { | ||
| name: "existing", environmentName: "dev", teamSlug: "pg-crud-team", highAvailability: true | ||
| }) { postgres { name } } }]] | ||
| t.check { | ||
| errors = { { locations = NotNull(), path = { "updatePostgres" }, message = Contains("You are authenticated") } }, | ||
| data = Null, | ||
| } | ||
| end) | ||
|
|
||
| Test.gql("Updating a missing Postgres fails", function(t) | ||
| t.addHeader("x-user-email", member:email()) | ||
| t.query [[mutation { updatePostgres(input: { | ||
| name: "missing", environmentName: "dev", teamSlug: "pg-crud-team", highAvailability: true | ||
| }) { postgres { name } } }]] | ||
| t.check { | ||
| errors = { { locations = NotNull(), path = { "updatePostgres" }, message = Contains("not found") } }, | ||
| data = Null, | ||
| } | ||
| end) | ||
|
|
||
| Test.gql("Names that Kubernetes would reject are rejected as field errors", function(t) | ||
| t.addHeader("x-user-email", member:email()) | ||
| for _, name in ipairs({ "Upper", "has/slash", "-leading" }) do | ||
| t.query(create(name, 'majorVersion: "18"')) | ||
| t.check { | ||
| errors = { { extensions = { field = "name" }, path = { "createPostgres" }, message = Contains("lowercase letters") } }, | ||
| data = Null, | ||
| } | ||
| end | ||
| t.query [[mutation { updatePostgres(input: { | ||
| name: "Upper", environmentName: "dev", teamSlug: "pg-crud-team", highAvailability: true | ||
| }) { postgres { name } } }]] | ||
| t.check { | ||
| errors = { { extensions = { field = "name" }, path = { "updatePostgres" }, message = Contains("lowercase letters") } }, | ||
| data = Null, | ||
| } | ||
| end) | ||
|
|
||
| Test.gql("Zero and negative resource quantities are rejected", function(t) | ||
| t.addHeader("x-user-email", member:email()) | ||
| for _, field in ipairs({ "cpu", "memory", "diskSize" }) do | ||
| t.query(create("badquantity", string.format('majorVersion: "18", %s: "-1"', field))) | ||
| t.check { | ||
| errors = { { extensions = { field = field }, path = { "createPostgres" }, message = Contains("must be greater than zero") } }, | ||
| data = Null, | ||
| } | ||
| end | ||
| end) | ||
|
|
||
| Test.gql("Creating and updating Postgres is recorded in the activity log", function(t) | ||
| t.addHeader("x-user-email", member:email()) | ||
| t.query [[{ team(slug: "pg-crud-team") { | ||
| activityLog(first: 50, filter: { activityTypes: [POSTGRES_CREATED, POSTGRES_UPDATED] }) { | ||
| nodes { __typename message actor resourceType resourceName environmentName teamSlug | ||
| ... on PostgresUpdatedActivityLogEntry { data { updatedFields { field oldValue newValue } } } | ||
| } | ||
| } | ||
| } }]] | ||
| t.check { | ||
| data = { team = { activityLog = { nodes = { | ||
| { __typename = "PostgresUpdatedActivityLogEntry", message = "Updated Postgres", actor = member:email(), resourceType = "POSTGRES", resourceName = "existing", environmentName = "dev", teamSlug = "pg-crud-team", | ||
| data = { updatedFields = { | ||
| { field = "highAvailability", oldValue = "false", newValue = "true" }, | ||
| { field = "diskSize", oldValue = "10Gi", newValue = "30Gi" }, | ||
| } }, | ||
| }, | ||
| { __typename = "PostgresCreatedActivityLogEntry", message = "Created Postgres", actor = member:email(), resourceType = "POSTGRES", resourceName = Ignore(), environmentName = "dev", teamSlug = "pg-crud-team" }, | ||
| { __typename = "PostgresCreatedActivityLogEntry", message = "Created Postgres", actor = member:email(), resourceType = "POSTGRES", resourceName = Ignore(), environmentName = "dev", teamSlug = "pg-crud-team" }, | ||
| } } } }, | ||
| } | ||
| end) |
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.