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.

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

feat: add group_sync and role_sync for coderd_organization_resource #147

Merged
merged 28 commits into from
Dec 3, 2024

Conversation

aslilac
Copy link
Member

@aslilac aslilac commented Nov 25, 2024

Group and role sync settings can now be configured as such:

resource "coderd_organization" "example" {
	group_sync {
		field = "wibble"
		regex_filter = "wib{2,}le"
		auto_create_missing = true
		mapping = {
			wibble = ["6e57187f-6543-46ab-a62c-a10065dd4314"]
		}
	}

	role_sync {
		field = "wobble"
		mapping = {
			wobble = ["wobbly"]
		}
	}
}

internal/provider/organization_resource_test.go Outdated Show resolved Hide resolved
internal/provider/organization_resource.go Outdated Show resolved Hide resolved
internal/provider/organization_resource.go Outdated Show resolved Hide resolved
return
}

// data.GroupSync = ???
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't recall if you can write to a config block (blocks can't be computed) like this. I suspect you can't.

If you can, I assume it would just be to error if the post-apply plan isn't empty.
For that you'd need to use types.ObjectValueFrom and provide it the type of the object using a map[string]attr.Type. I've got an example on the template resource & data source.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I figured something out that works 😄

internal/provider/organization_resource.go Outdated Show resolved Hide resolved
@Kira-Pilot Kira-Pilot requested a review from f0ssel December 2, 2024 19:12
@aslilac aslilac marked this pull request as ready for review December 3, 2024 00:15
@aslilac aslilac requested a review from ethanndickson December 3, 2024 00:15
Copy link
Member

@ethanndickson ethanndickson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

few comments but otherwise nice, lgtm!

internal/provider/organization_resource.go Show resolved Hide resolved
internal/provider/organization_resource.go Show resolved Hide resolved
Copy link
Member

@ethanndickson ethanndickson Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just realised we're missing enterprise/premium entitlement checks on this and the provisioner key resource. We have them on the workspace proxy and the enterprise features of template resources, but they run during apply, when they should really run during plan. Let's not worry about it for now, and at some point I'll see if I can get them working at plan-time using a plan modifier (validators don't have the provider config we need).

If that doesn't work we can just copy the ones at apply-time to these two new resources.

stringvalidator.LengthAtLeast(1),
},
},
"auto_create_missing": schema.BoolAttribute{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This defaults to false on coder right? Should just have a default set in the schema, and then you can remove the null checks on it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would that prevent group_sync from being null tho?

Copy link
Member

@ethanndickson ethanndickson Dec 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, the default only gets computed if the parent is known, so:

    group_sync {}

would default any values within it, but omitting the block altogether would not.

If you wanted to default the block to known, and the bool to false, then you'd also add a Default to the block itself.

@aslilac aslilac merged commit 283e3cc into main Dec 3, 2024
13 checks passed
@aslilac aslilac deleted the lilac/idp-sync branch December 3, 2024 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants