Skip to content

feat(objsto): upcloud_managed_object_storage_static_site resource #975

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

Open
villevsv-upcloud wants to merge 7 commits into
base: feat/v9-client
Choose a base branch
from
Open

feat(objsto): upcloud_managed_object_storage_static_site resource #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
163206f
refactor(objsto): use v9 client in custom domain resource
kangasta Mar 20, 2026
b76f5e5
DRAFT feat(objsto): add resource for managing static sites
kangasta Mar 20, 2026
1c4f616
chore(custom_domain): add mode from v9
villevsv-upcloud Mar 27, 2026
f80b541
feat(objsto): upcloud_managed_object_storage_static_site resource
villevsv-upcloud Mar 27, 2026
0a81a7f
Merge branch 'feat/v9-client' into feat/v9-objsto-static-site
villevsv-upcloud Apr 2, 2026
36db3e4
feat(object-storage): add static site entry to subcategories
villevsv-upcloud Apr 2, 2026
bbe0743
refactor(test): simplify variable declarations in static site tests
villevsv-upcloud Apr 2, 2026
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)

## [Unreleased]

### Added

- upcloud_managed_object_storage_static_site: new resource for Managed Object Storage static website configuration

## [5.36.0] - 2026-03-20

### Added
Expand Down
102 changes: 75 additions & 27 deletions internal/service/managedobjectstorage/custom_domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ type customDomainModel struct {
DomainName types.String `tfsdk:"domain_name"`
ID types.String `tfsdk:"id"`
ServiceUUID types.String `tfsdk:"service_uuid"`
Mode types.String `tfsdk:"mode"`
Type types.String `tfsdk:"type"`
}

Expand Down Expand Up @@ -77,6 +78,15 @@ func (r *managedObjectStorageCustomDomainResource) Schema(_ context.Context, _ r
stringvalidator.OneOf("public"),
},
},
"mode": schema.StringAttribute{
MarkdownDescription: "Routing mode for the domain. Defaults to `api`.",
Optional: true,
Computed: true,
Default: stringdefault.StaticString("api"),
Validators: []validator.String{
stringvalidator.OneOf("api", "static-website"),
},
},
},
}
}
Expand All @@ -93,14 +103,22 @@ func (r *managedObjectStorageCustomDomainResource) Create(ctx context.Context, r

serviceUUID, err := uuid.Parse(data.ServiceUUID.ValueString())
if err != nil {
resp.Diagnostics.AddError("Invalid service UUID", utils.ErrorDiagnosticDetail(err))
resp.Diagnostics.AddError(
"Unable to parse service UUID",
utils.ErrorDiagnosticDetail(err),
)
return
}

apiResp, err := r.client.AttachObjectStorageCustomDomainWithResponse(ctx, serviceUUID, v9.ObjectStorage2CustomDomainCreate{
DomainName: data.DomainName.ValueString(),
Type: v9.ObjectStorage2CustomDomainCreateType(data.Type.ValueString()),
})
apiResp, err := r.client.AttachObjectStorageCustomDomainWithResponse(
ctx,
serviceUUID,
v9.AttachObjectStorageCustomDomainJSONRequestBody{
DomainName: data.DomainName.ValueString(),
Type: v9.ObjectStorage2CustomDomainCreateType(data.Type.ValueString()),
Mode: (*v9.ObjectStorage2CustomDomainCreateMode)(data.Mode.ValueStringPointer()),
},
)
if err != nil {
resp.Diagnostics.AddError(
"Unable to create managed object storage custom domain",
Expand Down Expand Up @@ -132,21 +150,28 @@ func (r *managedObjectStorageCustomDomainResource) Read(ctx context.Context, req
return
}

var serviceUUIDStr, domainName string
resp.Diagnostics.Append(utils.UnmarshalIDDiag(data.ID.ValueString(), &serviceUUIDStr, &domainName)...)
var serviceUUID, domainName string
resp.Diagnostics.Append(utils.UnmarshalIDDiag(data.ID.ValueString(), &serviceUUID, &domainName)...)

if resp.Diagnostics.HasError() {
return
}

serviceUUID, err := uuid.Parse(serviceUUIDStr)
data.ServiceUUID = types.StringValue(serviceUUID)
parsedUUID, err := uuid.Parse(serviceUUID)
if err != nil {
resp.Diagnostics.AddError("Invalid service UUID", utils.ErrorDiagnosticDetail(err))
resp.Diagnostics.AddError(
"Unable to parse service UUID",
utils.ErrorDiagnosticDetail(err),
)
return
}

data.ServiceUUID = types.StringValue(serviceUUIDStr)
apiResp, err := r.client.GetObjectStorageCustomDomainWithResponse(ctx, serviceUUID, domainName)
apiResp, err := r.client.GetObjectStorageCustomDomainWithResponse(
ctx,
parsedUUID,
domainName,
)
if err != nil {
resp.Diagnostics.AddError(
"Unable to read managed object storage custom domain details",
Expand All @@ -173,6 +198,9 @@ func (r *managedObjectStorageCustomDomainResource) Read(ctx context.Context, req
if customDomain.Type != nil {
data.Type = types.StringValue(*customDomain.Type)
}
if customDomain.Mode != nil {
data.Mode = types.StringValue(string(*customDomain.Mode))
}
resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
}

Expand All @@ -185,25 +213,36 @@ func (r *managedObjectStorageCustomDomainResource) Update(ctx context.Context, r
return
}

var serviceUUIDStr, domainName string
resp.Diagnostics.Append(utils.UnmarshalIDDiag(state.ID.ValueString(), &serviceUUIDStr, &domainName)...)
var serviceUUID, domainName string
resp.Diagnostics.Append(utils.UnmarshalIDDiag(state.ID.ValueString(), &serviceUUID, &domainName)...)

if resp.Diagnostics.HasError() {
return
}

serviceUUID, err := uuid.Parse(serviceUUIDStr)
parsedUUID, err := uuid.Parse(serviceUUID)
if err != nil {
resp.Diagnostics.AddError("Invalid service UUID", utils.ErrorDiagnosticDetail(err))
resp.Diagnostics.AddError(
"Unable to parse service UUID",
utils.ErrorDiagnosticDetail(err),
)
return
}

newDomainName := data.DomainName.ValueString()
newType := v9.ObjectStorage2CustomDomainModifyType(data.Type.ValueString())
apiResp, err := r.client.ModifyObjectStorageCustomDomainWithResponse(ctx, serviceUUID, domainName, v9.ObjectStorage2CustomDomainModify{
DomainName: &newDomainName,
Type: &newType,
})
body := v9.ModifyObjectStorageCustomDomainJSONRequestBody{
DomainName: data.DomainName.ValueStringPointer(),
}

if data.Type.ValueString() != "" {
t := v9.ObjectStorage2CustomDomainModifyType(data.Type.ValueString())
body.Type = &t
}

apiResp, err := r.client.ModifyObjectStorageCustomDomainWithResponse(ctx,
parsedUUID,
domainName,
body,
)
if err != nil {
resp.Diagnostics.AddError(
"Unable to modify managed object storage custom domain",
Expand All @@ -227,33 +266,42 @@ func (r *managedObjectStorageCustomDomainResource) Update(ctx context.Context, r
if customDomain.Type != nil {
data.Type = types.StringValue(*customDomain.Type)
}
if customDomain.Mode != nil {
data.Mode = types.StringValue(string(*customDomain.Mode))
}
resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
}

func (r *managedObjectStorageCustomDomainResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
var data customDomainModel
resp.Diagnostics.Append(req.State.Get(ctx, &data)...)

var serviceUUIDStr, domainName string
resp.Diagnostics.Append(utils.UnmarshalIDDiag(data.ID.ValueString(), &serviceUUIDStr, &domainName)...)
var serviceUUID, domainName string
resp.Diagnostics.Append(utils.UnmarshalIDDiag(data.ID.ValueString(), &serviceUUID, &domainName)...)

if resp.Diagnostics.HasError() {
return
}

serviceUUID, err := uuid.Parse(serviceUUIDStr)
parsedUUID, err := uuid.Parse(serviceUUID)
if err != nil {
resp.Diagnostics.AddError("Invalid service UUID", utils.ErrorDiagnosticDetail(err))
resp.Diagnostics.AddError(
"Unable to parse service UUID",
utils.ErrorDiagnosticDetail(err),
)
return
}

apiResp, err := r.client.DeleteObjectStorageCustomDomainWithResponse(ctx, serviceUUID, domainName)
apiResp, err := r.client.DeleteObjectStorageCustomDomainWithResponse(
ctx,
parsedUUID,
domainName,
)
if err != nil {
resp.Diagnostics.AddError(
"Unable to delete managed object storage custom domain",
utils.ErrorDiagnosticDetail(err),
)
return
}
if apiResp.StatusCode() != http.StatusNoContent {
resp.Diagnostics.AddError(
Expand Down
Loading
Loading