Merge pull request #27 from terraform-community-providers/token-bugfix

Fix personal token header format
terraform-community-providers · Oct 13, 2023 · 11e975f · 11e975f
2 parents 1f89b29 + f7dd6b2
commit 11e975f
Show file tree

Hide file tree

Showing 9 changed files with 17,516 additions and 7,851 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 0.2.5
+
+### Enhancements
+* Add `allow_members_to_invite` to workspace settings
+
+### Bug Fixes
+* Fix issues with API token
+* Fix issues with updating workspace settings
+
 ## 0.2.3
 
 ### Enhancements

diff --git a/docs/resources/workspace_settings.md b/docs/resources/workspace_settings.md
@@ -23,6 +23,7 @@ resource "linear_workspace_settings" "example" {
 
 ### Optional
 
+- `allow_members_to_invite` (Boolean) Allow members to invite new members to the workspace. **Default** `true`.
 - `enable_git_linkback_messages` (Boolean) Enable git linkbacks for private repositories. **Default** `true`.
 - `enable_git_linkback_messages_public` (Boolean) Enable git linkbacks for public repositories. **Default** `false`.
 - `enable_roadmap` (Boolean) Enable roadmap for the workspace. **Default** `false`.

diff --git a/internal/provider/client.go b/internal/provider/client.go
@@ -8,7 +8,7 @@ type authedTransport struct {
 }
 
 func (t *authedTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	req.Header.Set("Authorization", "bearer "+t.token)
+	req.Header.Set("Authorization", t.token)
 
 	return t.wrapped.RoundTrip(req)
 }
diff --git a/internal/provider/generated.go b/internal/provider/generated.go
diff --git a/internal/provider/resource_team.graphql b/internal/provider/resource_team.graphql
@@ -45,6 +45,7 @@ query getTeam($key: String!) {
 # @genqlient(for: "TeamCreateInput.organizationId", omitempty: true)
 # @genqlient(for: "TeamCreateInput.defaultTemplateForMembersId", omitempty: true)
 # @genqlient(for: "TeamCreateInput.defaultTemplateForNonMembersId", omitempty: true)
+# @genqlient(for: "TeamCreateInput.defaultProjectTemplateId", omitempty: true)
 # @genqlient(for: "TeamCreateInput.markedAsDuplicateWorkflowStateId", omitempty: true)
 # @genqlient(for: "TeamCreateInput.autoCloseStateId", omitempty: true)
 mutation createTeam(
@@ -67,12 +68,14 @@ mutation createTeam(
 # @genqlient(for: "TeamUpdateInput.draftWorkflowStateId", omitempty: true)
 # @genqlient(for: "TeamUpdateInput.startWorkflowStateId", omitempty: true)
 # @genqlient(for: "TeamUpdateInput.reviewWorkflowStateId", omitempty: true)
+# @genqlient(for: "TeamUpdateInput.mergeableWorkflowStateId", omitempty: true)
 # @genqlient(for: "TeamUpdateInput.mergeWorkflowStateId", omitempty: true)
 # @genqlient(for: "TeamUpdateInput.defaultIssueStateId", omitempty: true)
 # @genqlient(for: "TeamUpdateInput.markedAsDuplicateWorkflowStateId", omitempty: true)
 # @genqlient(for: "TeamUpdateInput.autoCloseStateId", omitempty: true)
 # @genqlient(for: "TeamUpdateInput.defaultTemplateForMembersId", omitempty: true)
 # @genqlient(for: "TeamUpdateInput.defaultTemplateForNonMembersId", omitempty: true)
+# @genqlient(for: "TeamUpdateInput.defaultProjectTemplateId", omitempty: true)
 mutation updateTeam(
   $input: TeamUpdateInput!,
   $id: String!

diff --git a/internal/provider/resource_workspace_settings.go b/internal/provider/resource_workspace_settings.go
@@ -28,6 +28,7 @@ type WorkspaceSettingsResource struct {
 
 type WorkspaceSettingsResourceModel struct {
 	Id                              types.String `tfsdk:"id"`
+	AllowMembersToInvite            types.Bool   `tfsdk:"allow_members_to_invite"`
 	EnableRoadmap                   types.Bool   `tfsdk:"enable_roadmap"`
 	EnableGitLinkbackMessages       types.Bool   `tfsdk:"enable_git_linkback_messages"`
 	EnableGitLinkbackMessagesPublic types.Bool   `tfsdk:"enable_git_linkback_messages_public"`
@@ -48,6 +49,12 @@ func (r *WorkspaceSettingsResource) Schema(ctx context.Context, req resource.Sch
 					stringplanmodifier.UseStateForUnknown(),
 				},
 			},
+			"allow_members_to_invite": schema.BoolAttribute{
+				MarkdownDescription: "Allow members to invite new members to the workspace. **Default** `true`.",
+				Optional:            true,
+				Computed:            true,
+				Default:             booldefault.StaticBool(true),
+			},
 			"enable_roadmap": schema.BoolAttribute{
 				MarkdownDescription: "Enable roadmap for the workspace. **Default** `false`.",
 				Optional:            true,
@@ -99,7 +106,8 @@ func (r *WorkspaceSettingsResource) Create(ctx context.Context, req resource.Cre
 		return
 	}
 
-	input := UpdateOrganizationInput{
+	input := OrganizationUpdateInput{
+		AllowMembersToInvite:             data.AllowMembersToInvite.ValueBool(),
 		RoadmapEnabled:                   data.EnableRoadmap.ValueBool(),
 		GitLinkbackMessagesEnabled:       data.EnableGitLinkbackMessages.ValueBool(),
 		GitPublicLinkbackMessagesEnabled: data.EnableGitLinkbackMessagesPublic.ValueBool(),
@@ -115,6 +123,7 @@ func (r *WorkspaceSettingsResource) Create(ctx context.Context, req resource.Cre
 	organization := response.OrganizationUpdate.Organization
 
 	data.Id = types.StringValue(organization.Id)
+	data.AllowMembersToInvite = types.BoolValue(organization.AllowMembersToInvite)
 	data.EnableRoadmap = types.BoolValue(organization.RoadmapEnabled)
 	data.EnableGitLinkbackMessages = types.BoolValue(organization.GitLinkbackMessagesEnabled)
 	data.EnableGitLinkbackMessagesPublic = types.BoolValue(organization.GitPublicLinkbackMessagesEnabled)
@@ -141,6 +150,7 @@ func (r *WorkspaceSettingsResource) Read(ctx context.Context, req resource.ReadR
 	organization := response.Organization
 
 	data.Id = types.StringValue(organization.Id)
+	data.AllowMembersToInvite = types.BoolValue(organization.AllowMembersToInvite)
 	data.EnableRoadmap = types.BoolValue(organization.RoadmapEnabled)
 	data.EnableGitLinkbackMessages = types.BoolValue(organization.GitLinkbackMessagesEnabled)
 	data.EnableGitLinkbackMessagesPublic = types.BoolValue(organization.GitPublicLinkbackMessagesEnabled)
@@ -157,7 +167,8 @@ func (r *WorkspaceSettingsResource) Update(ctx context.Context, req resource.Upd
 		return
 	}
 
-	input := UpdateOrganizationInput{
+	input := OrganizationUpdateInput{
+		AllowMembersToInvite:             data.AllowMembersToInvite.ValueBool(),
 		RoadmapEnabled:                   data.EnableRoadmap.ValueBool(),
 		GitLinkbackMessagesEnabled:       data.EnableGitLinkbackMessages.ValueBool(),
 		GitPublicLinkbackMessagesEnabled: data.EnableGitLinkbackMessagesPublic.ValueBool(),
@@ -175,6 +186,7 @@ func (r *WorkspaceSettingsResource) Update(ctx context.Context, req resource.Upd
 	organization := response.OrganizationUpdate.Organization
 
 	data.Id = types.StringValue(organization.Id)
+	data.AllowMembersToInvite = types.BoolValue(organization.AllowMembersToInvite)
 	data.EnableRoadmap = types.BoolValue(organization.RoadmapEnabled)
 	data.EnableGitLinkbackMessages = types.BoolValue(organization.GitLinkbackMessagesEnabled)
 	data.EnableGitLinkbackMessagesPublic = types.BoolValue(organization.GitPublicLinkbackMessagesEnabled)
@@ -191,9 +203,10 @@ func (r *WorkspaceSettingsResource) Delete(ctx context.Context, req resource.Del
 		return
 	}
 
-	input := UpdateOrganizationInput{
+	input := OrganizationUpdateInput{
+		AllowMembersToInvite:             true,
 		RoadmapEnabled:                   false,
-		GitLinkbackMessagesEnabled:       false,
+		GitLinkbackMessagesEnabled:       true,
 		GitPublicLinkbackMessagesEnabled: false,
 	}
 

diff --git a/internal/provider/resource_workspace_settings.graphql b/internal/provider/resource_workspace_settings.graphql
@@ -1,5 +1,6 @@
 fragment Organization on Organization {
   id
+  allowMembersToInvite
   roadmapEnabled
   gitLinkbackMessagesEnabled
   gitPublicLinkbackMessagesEnabled
@@ -11,19 +12,21 @@ query getWorkspaceSettings {
   }
 }
 
-# @genqlient(for: "UpdateOrganizationInput.name", omitempty: true)
-# @genqlient(for: "UpdateOrganizationInput.urlKey", omitempty: true)
-# @genqlient(for: "UpdateOrganizationInput.logoUrl", omitempty: true)
-# @genqlient(for: "UpdateOrganizationInput.gitBranchFormat", omitempty: true)
-# @genqlient(for: "UpdateOrganizationInput.projectUpdatesReminderFrequency", omitempty: true)
-# @genqlient(for: "UpdateOrganizationInput.projectUpdateRemindersDay", omitempty: true)
-# @genqlient(for: "UpdateOrganizationInput.projectUpdateRemindersHour", omitempty: true)
-# @genqlient(for: "UpdateOrganizationInput.reducedPersonalInformation", omitempty: true)
-# @genqlient(for: "UpdateOrganizationInput.linearPreviewFlags", omitempty: true)
-# @genqlient(for: "UpdateOrganizationInput.allowedAuthServices", omitempty: true)
-# @genqlient(for: "UpdateOrganizationInput.oauthAppReview", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.name", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.urlKey", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.logoUrl", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.gitBranchFormat", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.projectUpdatesReminderFrequency", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.projectUpdateRemindersDay", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.projectUpdateRemindersHour", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.reducedPersonalInformation", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.linearPreviewFlags", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.allowedAuthServices", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.oauthAppReview", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.slaDayCount", omitempty: true)
+# @genqlient(for: "OrganizationUpdateInput.slaEnabled", omitempty: true)
 mutation updateWorkspaceSettings(
-  $input: UpdateOrganizationInput!,
+  $input: OrganizationUpdateInput!,
 ) {
   organizationUpdate(input: $input) {
     organization {

diff --git a/internal/provider/resource_workspace_settings_test.go b/internal/provider/resource_workspace_settings_test.go
@@ -16,6 +16,7 @@ func TestAccWorkspaceSettingsResourceDefault(t *testing.T) {
 				Config: testAccWorkspaceSettingsResourceConfigDefault(),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestMatchResourceAttr("linear_workspace_settings.test", "id", uuidRegex()),
+					resource.TestCheckResourceAttr("linear_workspace_settings.test", "allow_members_to_invite", "true"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_roadmap", "false"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_git_linkback_messages", "true"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_git_linkback_messages_public", "false"),
@@ -32,6 +33,7 @@ func TestAccWorkspaceSettingsResourceDefault(t *testing.T) {
 				Config: testAccWorkspaceSettingsResourceConfigDefault(),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestMatchResourceAttr("linear_workspace_settings.test", "id", uuidRegex()),
+					resource.TestCheckResourceAttr("linear_workspace_settings.test", "allow_members_to_invite", "true"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_roadmap", "false"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_git_linkback_messages", "true"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_git_linkback_messages_public", "false"),
@@ -42,6 +44,7 @@ func TestAccWorkspaceSettingsResourceDefault(t *testing.T) {
 				Config: testAccWorkspaceSettingsResourceConfigNonDefault(),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestMatchResourceAttr("linear_workspace_settings.test", "id", uuidRegex()),
+					resource.TestCheckResourceAttr("linear_workspace_settings.test", "allow_members_to_invite", "false"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_roadmap", "true"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_git_linkback_messages", "false"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_git_linkback_messages_public", "true"),
@@ -68,6 +71,7 @@ func TestAccWorkspaceSettingsResourceNonDefault(t *testing.T) {
 				Config: testAccWorkspaceSettingsResourceConfigNonDefault(),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestMatchResourceAttr("linear_workspace_settings.test", "id", uuidRegex()),
+					resource.TestCheckResourceAttr("linear_workspace_settings.test", "allow_members_to_invite", "false"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_roadmap", "true"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_git_linkback_messages", "false"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_git_linkback_messages_public", "true"),
@@ -84,6 +88,7 @@ func TestAccWorkspaceSettingsResourceNonDefault(t *testing.T) {
 				Config: testAccWorkspaceSettingsResourceConfigNonDefault(),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestMatchResourceAttr("linear_workspace_settings.test", "id", uuidRegex()),
+					resource.TestCheckResourceAttr("linear_workspace_settings.test", "allow_members_to_invite", "false"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_roadmap", "true"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_git_linkback_messages", "false"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_git_linkback_messages_public", "true"),
@@ -94,6 +99,7 @@ func TestAccWorkspaceSettingsResourceNonDefault(t *testing.T) {
 				Config: testAccWorkspaceSettingsResourceConfigDefault(),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestMatchResourceAttr("linear_workspace_settings.test", "id", uuidRegex()),
+					resource.TestCheckResourceAttr("linear_workspace_settings.test", "allow_members_to_invite", "true"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_roadmap", "false"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_git_linkback_messages", "true"),
 					resource.TestCheckResourceAttr("linear_workspace_settings.test", "enable_git_linkback_messages_public", "false"),
@@ -120,6 +126,7 @@ resource "linear_workspace_settings" "test" {
 func testAccWorkspaceSettingsResourceConfigNonDefault() string {
 	return `
 resource "linear_workspace_settings" "test" {
+	allow_members_to_invite = false
 	enable_roadmap = true
 	enable_git_linkback_messages = false
 	enable_git_linkback_messages_public = true