Skip to content

Support private Hydra projects #74

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

Draft
Ma27 wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Support private Hydra projects #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
126264e
Add `--include-private` flag to `generator.sh` to also take private p…
Ma27 Nov 13, 2021
fecb273
hydra/api: regenerate from `private-projects` branch
Ma27 Nov 13, 2021
e3a2c98
Take `private`-flag of projects into account in the Terraform provider
Ma27 Nov 13, 2021
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
140 changes: 138 additions & 2 deletions hydra/api/api.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 47 additions & 2 deletions hydra/api/hydra-api.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions hydra/resource_hydra_project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ func resourceHydraProject() *schema.Resource {
MaxItems: 1,
Elem: declInputSchema(),
},
"private": {
Description: "Whether or not the project is private.",
Type: schema.TypeBool,
Optional: true,
Default: false,
},
},
}
}
Expand Down Expand Up @@ -122,6 +128,11 @@ func createProjectPutBody(project string, d *schema.ResourceData) *api.PutProjec
body.Visible = &visible
}

private := d.Get("private").(bool)
if private {
body.Private = &private
}

declarative := d.Get("declarative").(*schema.Set)
if len(declarative.List()) > 0 {
// There will only ever be one declarative block, so it's fine to access the
Expand Down Expand Up @@ -218,6 +229,7 @@ func resourceHydraProjectRead(ctx context.Context, d *schema.ResourceData, m int
d.Set("owner", *projectResponse.Owner)
d.Set("enabled", *projectResponse.Enabled)
d.Set("visible", !(*projectResponse.Hidden))
d.Set("private", *projectResponse.Private)

// If Declarative can be dereferenced and every field is not empty, we update
// the internal representation with it. If the project was never declarative,
Expand Down
Loading