Skip to content

Commit

Permalink
remove nullable, as I felt it was a little bit too drastic of a change
Browse files Browse the repository at this point in the history
  • Loading branch information
SwiftEngineer committed Jun 14, 2022
1 parent cf06e02 commit ced6d24
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 88 deletions.
14 changes: 7 additions & 7 deletions admin_organization.go
Expand Up @@ -59,13 +59,13 @@ type AdminOrganization struct {
// AdminOrganizationUpdateOptions represents the admin options for updating an organization.
// https://www.terraform.io/docs/cloud/api/admin/organizations.html#request-body
type AdminOrganizationUpdateOptions struct {
AccessBetaTools *bool `jsonapi:"attr,access-beta-tools,omitempty"`
GlobalModuleSharing *bool `jsonapi:"attr,global-module-sharing,omitempty"`
IsDisabled *bool `jsonapi:"attr,is-disabled,omitempty"`
TerraformBuildWorkerApplyTimeout *string `jsonapi:"attr,terraform-build-worker-apply-timeout,omitempty"`
TerraformBuildWorkerPlanTimeout *string `jsonapi:"attr,terraform-build-worker-plan-timeout,omitempty"`
TerraformWorkerSudoEnabled bool `jsonapi:"attr,terraform-worker-sudo-enabled,omitempty"`
WorkspaceLimit *NullableInt `jsonapi:"attr,workspace-limit,omitempty"`
AccessBetaTools *bool `jsonapi:"attr,access-beta-tools,omitempty"`
GlobalModuleSharing *bool `jsonapi:"attr,global-module-sharing,omitempty"`
IsDisabled *bool `jsonapi:"attr,is-disabled,omitempty"`
TerraformBuildWorkerApplyTimeout *string `jsonapi:"attr,terraform-build-worker-apply-timeout,omitempty"`
TerraformBuildWorkerPlanTimeout *string `jsonapi:"attr,terraform-build-worker-plan-timeout,omitempty"`
TerraformWorkerSudoEnabled bool `jsonapi:"attr,terraform-worker-sudo-enabled,omitempty"`
WorkspaceLimit *int `jsonapi:"attr,workspace-limit,omitempty"`
}

// AdminOrganizationList represents a list of organizations via Admin API.
Expand Down
7 changes: 4 additions & 3 deletions admin_organization_integration_test.go
Expand Up @@ -252,7 +252,7 @@ func TestAdminOrganizations_Update(t *testing.T) {
opts = AdminOrganizationUpdateOptions{
GlobalModuleSharing: &globalModuleSharing,
IsDisabled: &isDisabled,
WorkspaceLimit: &NullableInt{&workspaceLimit},
WorkspaceLimit: &workspaceLimit,
}

adminOrg, err = client.Admin.Organizations.Update(ctx, org.Name, opts)
Expand All @@ -265,10 +265,11 @@ func TestAdminOrganizations_Update(t *testing.T) {

globalModuleSharing = false
isDisabled = false
workspaceLimit = 0
opts = AdminOrganizationUpdateOptions{
GlobalModuleSharing: &globalModuleSharing,
IsDisabled: &isDisabled,
WorkspaceLimit: &NullableInt{nil},
WorkspaceLimit: &workspaceLimit,
}

adminOrg, err = client.Admin.Organizations.Update(ctx, org.Name, opts)
Expand All @@ -278,7 +279,7 @@ func TestAdminOrganizations_Update(t *testing.T) {
assert.Equal(t, &globalModuleSharing, adminOrg.GlobalModuleSharing)
assert.Equal(t, adminOrg.IsDisabled, isDisabled)

assert.Nil(t, adminOrg.WorkspaceLimit)
assert.Equal(t, &workspaceLimit, adminOrg.WorkspaceLimit)
})
}

Expand Down
39 changes: 0 additions & 39 deletions nullable.go

This file was deleted.

39 changes: 0 additions & 39 deletions nullable_test.go

This file was deleted.

0 comments on commit ced6d24

Please sign in to comment.