Merge pull request 'feat: add artifactapi_local_pypi and artifactapi_local_rpm resources' (#8) from benvin/add-local-pypi-rpm-resources into main

Reviewed-on: #8

.woodpecker/build.yml

@@ -1,5 +1,5 @@
 when:
-  - event: [push, pull_request]
+  - event: pull_request
 
 steps:
   - name: build

.woodpecker/pre-commit.yaml

@@ -0,0 +1,18 @@
+when:
+  - event: pull_request
+
+steps:
+  - name: pre-commit
+    image: git.unkin.net/unkin/almalinux9-gobuilder:20260606
+    commands:
+      - uvx pre-commit run --all-files
+    backend_options:
+      kubernetes:
+        serviceAccountName: default
+        resources:
+          requests:
+            memory: 512Mi
+            cpu: 1
+          limits:
+            memory: 2Gi
+            cpu: 2

.woodpecker/release.yml

@@ -0,0 +1,19 @@
+when:
+  - event: tag
+
+steps:
+  - name: package
+    image: git.unkin.net/unkin/almalinux9-gobuilder:20260606
+    commands:
+      - make package VERSION=${CI_COMMIT_TAG}
+
+  - name: upload
+    image: git.unkin.net/unkin/almalinux9-base:20260606
+    commands:
+      - |
+        VERSION=$$(echo ${CI_COMMIT_TAG} | sed 's/^v//')
+        FILE="terraform-provider-artifactapi_$${VERSION}_linux_amd64.zip"
+        curl -f -X PUT \
+          "https://artifactapi3.k8s.syd1.au.unkin.net/api/v2/remotes/terraform-unkin/files/unkin/artifactapi/$${FILE}" \
+          -H "Content-Type: application/zip" \
+          --data-binary @"$${FILE}"

.woodpecker/test.yml

@@ -1,5 +1,5 @@
 when:
-  - event: [push, pull_request]
+  - event: pull_request
 
 steps:
   - name: lint

Makefile

@@ -1,9 +1,11 @@
-.PHONY: build install test lint fmt clean tidy
+.PHONY: build install test lint fmt clean tidy patch minor major package
 
 BINARY := terraform-provider-artifactapi
-VERSION ?= 0.0.1
+VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "0.0.0-dev")
 OS_ARCH := linux_amd64
-INSTALL_DIR := ~/.terraform.d/plugins/git.unkin.net/unkin/artifactapi/$(VERSION)/$(OS_ARCH)
+INSTALL_VERSION := $(shell echo $(VERSION) | sed 's/^v//')
+INSTALL_DIR := ~/.terraform.d/plugins/git.unkin.net/unkin/artifactapi/$(INSTALL_VERSION)/$(OS_ARCH)
+ZIP := $(BINARY)_$(INSTALL_VERSION)_$(OS_ARCH).zip
 
 GO_VERSION_REQUIRED := 1.23
 GO_VERSION_ACTUAL := $(shell go version | sed 's/go version go\([0-9]*\.[0-9]*\).*/\1/')
@@ -29,8 +31,31 @@ lint: check-go
 fmt: check-go
 	gofmt -w .
 
+package: build
+	cp $(BINARY) $(BINARY)_v$(INSTALL_VERSION)
+	python3 -c "import zipfile,sys; z=zipfile.ZipFile(sys.argv[1],'w',zipfile.ZIP_DEFLATED); z.write(sys.argv[2]); z.close()" $(ZIP) $(BINARY)_v$(INSTALL_VERSION)
+	rm $(BINARY)_v$(INSTALL_VERSION)
+
 clean:
-	rm -f $(BINARY)
+	rm -f $(BINARY) *.zip
 
 tidy:
 	go mod tidy
+
+_LATEST := $(shell git tag --sort=-v:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$$' | head -1)
+_BASE   := $(if $(_LATEST),$(_LATEST),v0.0.0)
+_MAJ    := $(shell echo $(_BASE) | sed 's/^v//' | cut -d. -f1)
+_MIN    := $(shell echo $(_BASE) | sed 's/^v//' | cut -d. -f2)
+_PAT    := $(shell echo $(_BASE) | sed 's/^v//' | cut -d. -f3)
+
+patch:
+	@NEW=v$(_MAJ).$(_MIN).$(shell expr $(_PAT) + 1); \
+	git tag $$NEW && echo "Tagged $$NEW" && git push origin $$NEW
+
+minor:
+	@NEW=v$(_MAJ).$(shell expr $(_MIN) + 1).0; \
+	git tag $$NEW && echo "Tagged $$NEW" && git push origin $$NEW
+
+major:
+	@NEW=v$(shell expr $(_MAJ) + 1).0.0; \
+	git tag $$NEW && echo "Tagged $$NEW" && git push origin $$NEW

examples/resources/artifactapi_local_pypi/main.tf

@@ -0,0 +1,4 @@
+resource "artifactapi_local_pypi" "internal" {
+  name        = "pypi-internal"
+  description = "Internal PyPI package registry"
+}

examples/resources/artifactapi_local_rpm/main.tf

@@ -0,0 +1,4 @@
+resource "artifactapi_local_rpm" "internal" {
+  name        = "rpm-internal"
+  description = "Internal RPM package repository"
+}

internal/provider/helpers.go

@@ -16,7 +16,7 @@ func listToStrings(ctx context.Context, l types.List) []string {
 }
 
 func stringsToList(ctx context.Context, ss []string) types.List {
-	if len(ss) == 0 {
+	if ss == nil {
 		return types.ListNull(types.StringType)
 	}
 	elems := make([]types.String, len(ss))
@@ -26,3 +26,14 @@ func stringsToList(ctx context.Context, ss []string) types.List {
 	list, _ := types.ListValueFrom(ctx, types.StringType, elems)
 	return list
 }
+
+// preserveListNullEmptySemantics keeps the prior null/empty distinction when
+// the API returns null for a field that was previously an empty list.
+// Without this, OpenTofu reports "inconsistent result after apply" because
+// the plan/state had [] but the provider returned null.
+func preserveListNullEmptySemantics(prior, current types.List) types.List {
+	if current.IsNull() && !prior.IsNull() && len(prior.Elements()) == 0 {
+		return prior
+	}
+	return current
+}

internal/provider/helpers_test.go

@@ -63,8 +63,11 @@ func TestListToStrings_WithValues(t *testing.T) {
 func TestStringsToList_EmptySlice(t *testing.T) {
 	ctx := context.Background()
 	result := stringsToList(ctx, []string{})
-	if !result.IsNull() {
-		t.Fatalf("expected null list for empty slice, got %v", result)
+	if result.IsNull() {
+		t.Fatalf("expected empty list for empty slice, got null")
+	}
+	if len(result.Elements()) != 0 {
+		t.Fatalf("expected 0 elements, got %d", len(result.Elements()))
 	}
 }
 
@@ -103,3 +106,42 @@ func TestStringsToList_SingleValue(t *testing.T) {
 		t.Fatalf("expected [\"solo\"], got %v", back)
 	}
 }
+
+func TestPreserveListNullEmptySemantics(t *testing.T) {
+	ctx := context.Background()
+	emptyList, _ := types.ListValueFrom(ctx, types.StringType, []types.String{})
+	nullList := types.ListNull(types.StringType)
+	populatedList := stringsToList(ctx, []string{"a"})
+
+	t.Run("prior empty + current null → preserves empty", func(t *testing.T) {
+		result := preserveListNullEmptySemantics(emptyList, nullList)
+		if result.IsNull() {
+			t.Fatal("expected empty list, got null")
+		}
+		if len(result.Elements()) != 0 {
+			t.Fatalf("expected 0 elements, got %d", len(result.Elements()))
+		}
+	})
+
+	t.Run("prior null + current null → stays null", func(t *testing.T) {
+		result := preserveListNullEmptySemantics(nullList, nullList)
+		if !result.IsNull() {
+			t.Fatal("expected null, got non-null")
+		}
+	})
+
+	t.Run("prior empty + current populated → uses current", func(t *testing.T) {
+		result := preserveListNullEmptySemantics(emptyList, populatedList)
+		elems := listToStrings(ctx, result)
+		if len(elems) != 1 || elems[0] != "a" {
+			t.Fatalf("expected [a], got %v", elems)
+		}
+	})
+
+	t.Run("prior populated + current null → stays null", func(t *testing.T) {
+		result := preserveListNullEmptySemantics(populatedList, nullList)
+		if !result.IsNull() {
+			t.Fatal("expected null (prior was populated, not empty — no preservation)")
+		}
+	})
+}

internal/provider/provider.go

@@ -69,6 +69,8 @@ func (p *ArtifactAPIProvider) Resources(_ context.Context) []func() resource.Res
 		newRemoteResource("goproxy"),
 		NewVirtualResource,
 		NewLocalTerraformResource,
+		NewLocalPyPIResource,
+		NewLocalRPMResource,
 	}
 }
 

internal/provider/provider_test.go

@@ -66,8 +66,8 @@ func TestProvider_Resources(t *testing.T) {
 	p := &ArtifactAPIProvider{version: "1.0.0"}
 	resources := p.Resources(context.Background())
 
-	// 10 remote resource types + 1 virtual + 1 local_terraform = 12
-	expectedCount := 12
+	// 10 remote resource types + 1 virtual + 1 local_terraform + 1 local_pypi + 1 local_rpm = 14
+	expectedCount := 14
 	if len(resources) != expectedCount {
 		t.Fatalf("expected %d resources, got %d", expectedCount, len(resources))
 	}
@@ -108,6 +108,8 @@ func TestProvider_Resources_ContainsExpectedTypes(t *testing.T) {
 		"artifactapi_remote_goproxy",
 		"artifactapi_virtual",
 		"artifactapi_local_terraform",
+		"artifactapi_local_pypi",
+		"artifactapi_local_rpm",
 	}
 
 	for _, name := range expected {

internal/provider/resource_local_pypi.go

@@ -0,0 +1,164 @@
+package provider
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-framework/path"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+var (
+	_ resource.Resource                = &localPyPIResource{}
+	_ resource.ResourceWithImportState = &localPyPIResource{}
+)
+
+type localPyPIResource struct {
+	client *apiClient
+}
+
+type localPyPIResourceModel struct {
+	Name        types.String `tfsdk:"name"`
+	Description types.String `tfsdk:"description"`
+}
+
+func NewLocalPyPIResource() resource.Resource {
+	return &localPyPIResource{}
+}
+
+func (r *localPyPIResource) Metadata(_ context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) {
+	resp.TypeName = req.ProviderTypeName + "_local_pypi"
+}
+
+func (r *localPyPIResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
+	resp.Schema = schema.Schema{
+		Description: "Manages a local ArtifactAPI PyPI repository for hosting Python packages directly.",
+		Attributes: map[string]schema.Attribute{
+			"name": schema.StringAttribute{
+				Description: "Unique name of the local PyPI repository.",
+				Required:    true,
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplace(),
+				},
+			},
+			"description": schema.StringAttribute{
+				Description: "Human-readable description.",
+				Optional:    true,
+				Computed:    true,
+				Default:     stringdefault.StaticString(""),
+			},
+		},
+	}
+}
+
+func (r *localPyPIResource) Configure(_ context.Context, req resource.ConfigureRequest, resp *resource.ConfigureResponse) {
+	if req.ProviderData == nil {
+		return
+	}
+	client, ok := req.ProviderData.(*apiClient)
+	if !ok {
+		resp.Diagnostics.AddError("unexpected provider data type", fmt.Sprintf("got %T", req.ProviderData))
+		return
+	}
+	r.client = client
+}
+
+func (r *localPyPIResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
+	var plan localPyPIResourceModel
+	resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	api := localPyPIModelToAPI(plan)
+	api.ManagedBy = "terraform"
+
+	var created remoteAPI
+	if err := r.client.post(ctx, "/api/v2/remotes", api, &created); err != nil {
+		resp.Diagnostics.AddError("create local pypi failed", err.Error())
+		return
+	}
+
+	state := localPyPIAPIToModel(created)
+	resp.Diagnostics.Append(resp.State.Set(ctx, state)...)
+}
+
+func (r *localPyPIResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
+	var state localPyPIResourceModel
+	resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	var remote remoteAPI
+	err := r.client.get(ctx, "/api/v2/remotes/"+state.Name.ValueString(), &remote)
+	if err != nil {
+		if isNotFound(err) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
+		resp.Diagnostics.AddError("read local pypi failed", err.Error())
+		return
+	}
+
+	newState := localPyPIAPIToModel(remote)
+	resp.Diagnostics.Append(resp.State.Set(ctx, newState)...)
+}
+
+func (r *localPyPIResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	var plan localPyPIResourceModel
+	resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	api := localPyPIModelToAPI(plan)
+	api.ManagedBy = "terraform"
+
+	var updated remoteAPI
+	if err := r.client.put(ctx, "/api/v2/remotes/"+plan.Name.ValueString(), api, &updated); err != nil {
+		resp.Diagnostics.AddError("update local pypi failed", err.Error())
+		return
+	}
+
+	state := localPyPIAPIToModel(updated)
+	resp.Diagnostics.Append(resp.State.Set(ctx, state)...)
+}
+
+func (r *localPyPIResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
+	var state localPyPIResourceModel
+	resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	if err := r.client.del(ctx, "/api/v2/remotes/"+state.Name.ValueString()); err != nil {
+		resp.Diagnostics.AddError("delete local pypi failed", err.Error())
+		return
+	}
+}
+
+func (r *localPyPIResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
+	resource.ImportStatePassthroughID(ctx, path.Root("name"), req, resp)
+}
+
+func localPyPIModelToAPI(m localPyPIResourceModel) remoteAPI {
+	return remoteAPI{
+		Name:        m.Name.ValueString(),
+		PackageType: "pypi",
+		RepoType:    "local",
+		Description: m.Description.ValueString(),
+	}
+}
+
+func localPyPIAPIToModel(api remoteAPI) localPyPIResourceModel {
+	return localPyPIResourceModel{
+		Name:        types.StringValue(api.Name),
+		Description: types.StringValue(api.Description),
+	}
+}

internal/provider/resource_local_pypi_test.go

@@ -0,0 +1,125 @@
+package provider
+
+import (
+	"context"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+func TestLocalPyPIModelToAPI(t *testing.T) {
+	model := localPyPIResourceModel{
+		Name:        types.StringValue("pypi-internal"),
+		Description: types.StringValue("Internal PyPI registry"),
+	}
+
+	api := localPyPIModelToAPI(model)
+
+	if api.Name != "pypi-internal" {
+		t.Errorf("Name: expected pypi-internal, got %s", api.Name)
+	}
+	if api.PackageType != "pypi" {
+		t.Errorf("PackageType: expected pypi, got %s", api.PackageType)
+	}
+	if api.RepoType != "local" {
+		t.Errorf("RepoType: expected local, got %s", api.RepoType)
+	}
+	if api.Description != "Internal PyPI registry" {
+		t.Errorf("Description: expected 'Internal PyPI registry', got %s", api.Description)
+	}
+}
+
+func TestLocalPyPIModelToAPI_EmptyDescription(t *testing.T) {
+	model := localPyPIResourceModel{
+		Name:        types.StringValue("pypi-empty"),
+		Description: types.StringValue(""),
+	}
+
+	api := localPyPIModelToAPI(model)
+
+	if api.Name != "pypi-empty" {
+		t.Errorf("Name: expected pypi-empty, got %s", api.Name)
+	}
+	if api.Description != "" {
+		t.Errorf("Description: expected empty string, got %s", api.Description)
+	}
+	if api.PackageType != "pypi" {
+		t.Errorf("PackageType: expected pypi, got %s", api.PackageType)
+	}
+	if api.RepoType != "local" {
+		t.Errorf("RepoType: expected local, got %s", api.RepoType)
+	}
+}
+
+func TestLocalPyPIAPIToModel(t *testing.T) {
+	api := remoteAPI{
+		Name:        "pypi-internal",
+		PackageType: "pypi",
+		RepoType:    "local",
+		Description: "Internal PyPI registry",
+		ManagedBy:   "terraform",
+	}
+
+	model := localPyPIAPIToModel(api)
+
+	if model.Name.ValueString() != "pypi-internal" {
+		t.Errorf("Name: expected pypi-internal, got %s", model.Name.ValueString())
+	}
+	if model.Description.ValueString() != "Internal PyPI registry" {
+		t.Errorf("Description: expected 'Internal PyPI registry', got %s", model.Description.ValueString())
+	}
+}
+
+func TestLocalPyPIRoundTrip(t *testing.T) {
+	original := localPyPIResourceModel{
+		Name:        types.StringValue("roundtrip-pypi"),
+		Description: types.StringValue("Round trip test"),
+	}
+
+	api := localPyPIModelToAPI(original)
+	result := localPyPIAPIToModel(api)
+
+	if result.Name.ValueString() != original.Name.ValueString() {
+		t.Errorf("Name: expected %s, got %s", original.Name.ValueString(), result.Name.ValueString())
+	}
+	if result.Description.ValueString() != original.Description.ValueString() {
+		t.Errorf("Description: expected %s, got %s", original.Description.ValueString(), result.Description.ValueString())
+	}
+}
+
+func TestLocalPyPIResource_Metadata(t *testing.T) {
+	r := NewLocalPyPIResource()
+	req := resource.MetadataRequest{ProviderTypeName: "artifactapi"}
+	var resp resource.MetadataResponse
+	r.Metadata(context.Background(), req, &resp)
+	if resp.TypeName != "artifactapi_local_pypi" {
+		t.Errorf("expected artifactapi_local_pypi, got %s", resp.TypeName)
+	}
+}
+
+func TestLocalPyPIResource_Schema(t *testing.T) {
+	r := NewLocalPyPIResource()
+	req := resource.SchemaRequest{}
+	var resp resource.SchemaResponse
+	r.Schema(context.Background(), req, &resp)
+
+	expectedAttrs := []string{"name", "description"}
+	for _, attr := range expectedAttrs {
+		if _, ok := resp.Schema.Attributes[attr]; !ok {
+			t.Errorf("missing expected attribute: %s", attr)
+		}
+	}
+
+	if len(resp.Schema.Attributes) != len(expectedAttrs) {
+		t.Errorf("expected %d attributes, got %d", len(expectedAttrs), len(resp.Schema.Attributes))
+	}
+}
+
+func TestNewLocalPyPIResource_Type(t *testing.T) {
+	r := NewLocalPyPIResource()
+	_, ok := r.(*localPyPIResource)
+	if !ok {
+		t.Error("expected *localPyPIResource")
+	}
+}

internal/provider/resource_local_rpm.go

@@ -0,0 +1,164 @@
+package provider
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-framework/path"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+var (
+	_ resource.Resource                = &localRPMResource{}
+	_ resource.ResourceWithImportState = &localRPMResource{}
+)
+
+type localRPMResource struct {
+	client *apiClient
+}
+
+type localRPMResourceModel struct {
+	Name        types.String `tfsdk:"name"`
+	Description types.String `tfsdk:"description"`
+}
+
+func NewLocalRPMResource() resource.Resource {
+	return &localRPMResource{}
+}
+
+func (r *localRPMResource) Metadata(_ context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) {
+	resp.TypeName = req.ProviderTypeName + "_local_rpm"
+}
+
+func (r *localRPMResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
+	resp.Schema = schema.Schema{
+		Description: "Manages a local ArtifactAPI RPM repository for hosting RPM packages directly.",
+		Attributes: map[string]schema.Attribute{
+			"name": schema.StringAttribute{
+				Description: "Unique name of the local RPM repository.",
+				Required:    true,
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplace(),
+				},
+			},
+			"description": schema.StringAttribute{
+				Description: "Human-readable description.",
+				Optional:    true,
+				Computed:    true,
+				Default:     stringdefault.StaticString(""),
+			},
+		},
+	}
+}
+
+func (r *localRPMResource) Configure(_ context.Context, req resource.ConfigureRequest, resp *resource.ConfigureResponse) {
+	if req.ProviderData == nil {
+		return
+	}
+	client, ok := req.ProviderData.(*apiClient)
+	if !ok {
+		resp.Diagnostics.AddError("unexpected provider data type", fmt.Sprintf("got %T", req.ProviderData))
+		return
+	}
+	r.client = client
+}
+
+func (r *localRPMResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
+	var plan localRPMResourceModel
+	resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	api := localRPMModelToAPI(plan)
+	api.ManagedBy = "terraform"
+
+	var created remoteAPI
+	if err := r.client.post(ctx, "/api/v2/remotes", api, &created); err != nil {
+		resp.Diagnostics.AddError("create local rpm failed", err.Error())
+		return
+	}
+
+	state := localRPMAPIToModel(created)
+	resp.Diagnostics.Append(resp.State.Set(ctx, state)...)
+}
+
+func (r *localRPMResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
+	var state localRPMResourceModel
+	resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	var remote remoteAPI
+	err := r.client.get(ctx, "/api/v2/remotes/"+state.Name.ValueString(), &remote)
+	if err != nil {
+		if isNotFound(err) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
+		resp.Diagnostics.AddError("read local rpm failed", err.Error())
+		return
+	}
+
+	newState := localRPMAPIToModel(remote)
+	resp.Diagnostics.Append(resp.State.Set(ctx, newState)...)
+}
+
+func (r *localRPMResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	var plan localRPMResourceModel
+	resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	api := localRPMModelToAPI(plan)
+	api.ManagedBy = "terraform"
+
+	var updated remoteAPI
+	if err := r.client.put(ctx, "/api/v2/remotes/"+plan.Name.ValueString(), api, &updated); err != nil {
+		resp.Diagnostics.AddError("update local rpm failed", err.Error())
+		return
+	}
+
+	state := localRPMAPIToModel(updated)
+	resp.Diagnostics.Append(resp.State.Set(ctx, state)...)
+}
+
+func (r *localRPMResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
+	var state localRPMResourceModel
+	resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	if err := r.client.del(ctx, "/api/v2/remotes/"+state.Name.ValueString()); err != nil {
+		resp.Diagnostics.AddError("delete local rpm failed", err.Error())
+		return
+	}
+}
+
+func (r *localRPMResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
+	resource.ImportStatePassthroughID(ctx, path.Root("name"), req, resp)
+}
+
+func localRPMModelToAPI(m localRPMResourceModel) remoteAPI {
+	return remoteAPI{
+		Name:        m.Name.ValueString(),
+		PackageType: "rpm",
+		RepoType:    "local",
+		Description: m.Description.ValueString(),
+	}
+}
+
+func localRPMAPIToModel(api remoteAPI) localRPMResourceModel {
+	return localRPMResourceModel{
+		Name:        types.StringValue(api.Name),
+		Description: types.StringValue(api.Description),
+	}
+}

internal/provider/resource_local_rpm_test.go

@@ -0,0 +1,125 @@
+package provider
+
+import (
+	"context"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+func TestLocalRPMModelToAPI(t *testing.T) {
+	model := localRPMResourceModel{
+		Name:        types.StringValue("rpm-internal"),
+		Description: types.StringValue("Internal RPM repository"),
+	}
+
+	api := localRPMModelToAPI(model)
+
+	if api.Name != "rpm-internal" {
+		t.Errorf("Name: expected rpm-internal, got %s", api.Name)
+	}
+	if api.PackageType != "rpm" {
+		t.Errorf("PackageType: expected rpm, got %s", api.PackageType)
+	}
+	if api.RepoType != "local" {
+		t.Errorf("RepoType: expected local, got %s", api.RepoType)
+	}
+	if api.Description != "Internal RPM repository" {
+		t.Errorf("Description: expected 'Internal RPM repository', got %s", api.Description)
+	}
+}
+
+func TestLocalRPMModelToAPI_EmptyDescription(t *testing.T) {
+	model := localRPMResourceModel{
+		Name:        types.StringValue("rpm-empty"),
+		Description: types.StringValue(""),
+	}
+
+	api := localRPMModelToAPI(model)
+
+	if api.Name != "rpm-empty" {
+		t.Errorf("Name: expected rpm-empty, got %s", api.Name)
+	}
+	if api.Description != "" {
+		t.Errorf("Description: expected empty string, got %s", api.Description)
+	}
+	if api.PackageType != "rpm" {
+		t.Errorf("PackageType: expected rpm, got %s", api.PackageType)
+	}
+	if api.RepoType != "local" {
+		t.Errorf("RepoType: expected local, got %s", api.RepoType)
+	}
+}
+
+func TestLocalRPMAPIToModel(t *testing.T) {
+	api := remoteAPI{
+		Name:        "rpm-internal",
+		PackageType: "rpm",
+		RepoType:    "local",
+		Description: "Internal RPM repository",
+		ManagedBy:   "terraform",
+	}
+
+	model := localRPMAPIToModel(api)
+
+	if model.Name.ValueString() != "rpm-internal" {
+		t.Errorf("Name: expected rpm-internal, got %s", model.Name.ValueString())
+	}
+	if model.Description.ValueString() != "Internal RPM repository" {
+		t.Errorf("Description: expected 'Internal RPM repository', got %s", model.Description.ValueString())
+	}
+}
+
+func TestLocalRPMRoundTrip(t *testing.T) {
+	original := localRPMResourceModel{
+		Name:        types.StringValue("roundtrip-rpm"),
+		Description: types.StringValue("Round trip test"),
+	}
+
+	api := localRPMModelToAPI(original)
+	result := localRPMAPIToModel(api)
+
+	if result.Name.ValueString() != original.Name.ValueString() {
+		t.Errorf("Name: expected %s, got %s", original.Name.ValueString(), result.Name.ValueString())
+	}
+	if result.Description.ValueString() != original.Description.ValueString() {
+		t.Errorf("Description: expected %s, got %s", original.Description.ValueString(), result.Description.ValueString())
+	}
+}
+
+func TestLocalRPMResource_Metadata(t *testing.T) {
+	r := NewLocalRPMResource()
+	req := resource.MetadataRequest{ProviderTypeName: "artifactapi"}
+	var resp resource.MetadataResponse
+	r.Metadata(context.Background(), req, &resp)
+	if resp.TypeName != "artifactapi_local_rpm" {
+		t.Errorf("expected artifactapi_local_rpm, got %s", resp.TypeName)
+	}
+}
+
+func TestLocalRPMResource_Schema(t *testing.T) {
+	r := NewLocalRPMResource()
+	req := resource.SchemaRequest{}
+	var resp resource.SchemaResponse
+	r.Schema(context.Background(), req, &resp)
+
+	expectedAttrs := []string{"name", "description"}
+	for _, attr := range expectedAttrs {
+		if _, ok := resp.Schema.Attributes[attr]; !ok {
+			t.Errorf("missing expected attribute: %s", attr)
+		}
+	}
+
+	if len(resp.Schema.Attributes) != len(expectedAttrs) {
+		t.Errorf("expected %d attributes, got %d", len(expectedAttrs), len(resp.Schema.Attributes))
+	}
+}
+
+func TestNewLocalRPMResource_Type(t *testing.T) {
+	r := NewLocalRPMResource()
+	_, ok := r.(*localRPMResource)
+	if !ok {
+		t.Error("expected *localRPMResource")
+	}
+}

internal/provider/resource_remote.go

@@ -181,6 +181,7 @@ func (r *remoteResource) Create(ctx context.Context, req resource.CreateRequest,
 	}
 
 	state := r.apiToModel(ctx, created)
+	reconcileOptionalLists(&plan, &state)
 	resp.Diagnostics.Append(resp.State.Set(ctx, state)...)
 }
 
@@ -203,6 +204,7 @@ func (r *remoteResource) Read(ctx context.Context, req resource.ReadRequest, res
 	}
 
 	newState := r.apiToModel(ctx, remote)
+	reconcileOptionalLists(&state, &newState)
 	resp.Diagnostics.Append(resp.State.Set(ctx, newState)...)
 }
 
@@ -223,6 +225,7 @@ func (r *remoteResource) Update(ctx context.Context, req resource.UpdateRequest,
 	}
 
 	state := r.apiToModel(ctx, updated)
+	reconcileOptionalLists(&plan, &state)
 	resp.Diagnostics.Append(resp.State.Set(ctx, state)...)
 }
 
@@ -243,6 +246,14 @@ func (r *remoteResource) ImportState(ctx context.Context, req resource.ImportSta
 	resource.ImportStatePassthroughID(ctx, path.Root("name"), req, resp)
 }
 
+func reconcileOptionalLists(prior, current *remoteResourceModel) {
+	current.Patterns = preserveListNullEmptySemantics(prior.Patterns, current.Patterns)
+	current.Blocklist = preserveListNullEmptySemantics(prior.Blocklist, current.Blocklist)
+	current.MutablePatterns = preserveListNullEmptySemantics(prior.MutablePatterns, current.MutablePatterns)
+	current.ImmutablePatterns = preserveListNullEmptySemantics(prior.ImmutablePatterns, current.ImmutablePatterns)
+	current.BanTags = preserveListNullEmptySemantics(prior.BanTags, current.BanTags)
+}
+
 func (r *remoteResource) modelToAPI(ctx context.Context, m remoteResourceModel) remoteAPI {
 	api := remoteAPI{
 		Name:              m.Name.ValueString(),