feat: Support import for sonatyperepo_repository_p2_* resources (#177)

* hotfix: docker repository import error

* simplify repository common for import and add docker import test

* use common constant for errors

* handle import for p2 repositories

* follow docker repositories pattern

Author: yfougeray-euphoria

docs/resources/repository_p2_proxy.md

@@ -122,3 +122,16 @@ Required:
 Optional:
 
 - `asset_path_regex` (String) Regular Expression of Asset Paths to pull pre-emptively pull
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+# Existing proxy p2 repository configuration can be imported as follows.
+#
+# NOTE: The Identifier REPOSITORY_NAME needs to match repository name in your sonatype nexus repository instance.
+
+# Example
+terraform import sonatyperepo_repository_p2_proxy.example REPOSITORY_NAME
+```

examples/resources/sonatyperepo_repository_p2_proxy/import.sh

@@ -0,0 +1,6 @@
+# Existing proxy p2 repository configuration can be imported as follows.
+#
+# NOTE: The Identifier REPOSITORY_NAME needs to match repository name in your sonatype nexus repository instance.
+
+# Example
+terraform import sonatyperepo_repository_p2_proxy.example REPOSITORY_NAME

internal/provider/model/repository_p2.go

@@ -17,6 +17,8 @@
 package model
 
 import (
+	"terraform-provider-sonatyperepo/internal/provider/common"
+
 	"github.com/hashicorp/terraform-plugin-framework/types"
 
 	sonatyperepo "github.com/sonatype-nexus-community/nexus-repo-api-client-go/v3"
@@ -48,7 +50,14 @@ func (m *RepositoryP2ProxyModel) FromApiModel(api sonatyperepo.SimpleApiProxyRep
 	m.HttpClient.MapFromApiHttpClientAttributes(&api.HttpClient)
 	m.RoutingRule = types.StringPointerValue(api.RoutingRuleName)
 	if api.Replication != nil {
+		m.Replication = &RepositoryReplicationModel{}
 		m.Replication.MapFromApi(api.Replication)
+	} else {
+		// Set default values when API doesn't provide replication data
+		m.Replication = &RepositoryReplicationModel{
+			PreemptivePullEnabled: types.BoolValue(common.DEFAULT_PROXY_PREEMPTIVE_PULL),
+			AssetPathRegex:        types.StringNull(),
+		}
 	}
 }
 

internal/provider/repository/format/p2.go

@@ -67,6 +67,9 @@ func (f *P2RepositoryFormatProxy) DoReadRequest(state any, apiClient *sonatypere
 
 	// Call to API to Read
 	apiResponse, httpResponse, err := apiClient.RepositoryManagementAPI.GetP2ProxyRepository(ctx, stateModel.Name.ValueString()).Execute()
+	if err != nil {
+		return nil, httpResponse, err
+	}
 	return *apiResponse, httpResponse, err
 }
 
@@ -102,7 +105,21 @@ func (f *P2RepositoryFormatProxy) UpdatePlanForState(plan any) any {
 }
 
 func (f *P2RepositoryFormatProxy) UpdateStateFromApi(state any, api any) any {
-	stateModel := (state).(model.RepositoryP2ProxyModel)
+	var stateModel model.RepositoryP2ProxyModel
+	// During import, state might be nil, so we create a new model
+	if state != nil {
+		stateModel = (state).(model.RepositoryP2ProxyModel)
+	}
 	stateModel.FromApiModel((api).(sonatyperepo.SimpleApiProxyRepository))
 	return stateModel
 }
+
+// DoImportRequest implements the import functionality for P2 Proxy repositories
+func (f *P2RepositoryFormatProxy) DoImportRequest(repositoryName string, apiClient *sonatyperepo.APIClient, ctx context.Context) (any, *http.Response, error) {
+	// Call to API to Read repository for import
+	apiResponse, httpResponse, err := apiClient.RepositoryManagementAPI.GetP2ProxyRepository(ctx, repositoryName).Execute()
+	if err != nil {
+		return nil, httpResponse, err
+	}
+	return *apiResponse, httpResponse, nil
+}

internal/provider/repository/repository_common.go

@@ -381,7 +381,7 @@ func (r *repositoryResource) ImportState(ctx context.Context, req resource.Impor
 		if httpResponse != nil && httpResponse.StatusCode == http.StatusNotFound {
 			resp.Diagnostics.AddError(
 				fmt.Sprintf("Repository '%s' not found", repositoryName),
-				fmt.Sprintf("The %s %s repository '%s' does not exist or you do not have permission to access it.", 
+				fmt.Sprintf("The %s %s repository '%s' does not exist or you do not have permission to access it.",
 					r.RepositoryFormat.GetKey(), r.RepositoryType.String(), repositoryName),
 			)
 		} else {
@@ -408,7 +408,7 @@ func (r *repositoryResource) ImportState(ctx context.Context, req resource.Impor
 	// UpdateStateFromApi expects an empty instance of the proper model type and returns a populated one
 	// Pass nil as the first parameter - UpdateStateFromApi will create the proper model type
 	stateModel := r.RepositoryFormat.UpdateStateFromApi(nil, apiResponse)
-	
+
 	// Update plan for state (sets last_updated timestamp)
 	stateModel = r.RepositoryFormat.UpdatePlanForState(stateModel)
 
@@ -504,4 +504,4 @@ func getHostedStandardSchema(repoFormat string, repoType format.RepositoryType)
 			},
 		},
 	}
-}
+}

internal/provider/repository/repository_p2_x_resources_test.go

@@ -106,3 +106,55 @@ resource "%s" "repo" {
 		},
 	})
 }
+
+func TestAccRepositoryP2ProxyImport(t *testing.T) {
+	randomString := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
+	resourceType := "sonatyperepo_repository_p2_proxy"
+	resourceName := fmt.Sprintf("%s.repo", resourceType)
+	repoName := fmt.Sprintf("p2-proxy-import-%s", randomString)
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: utils_test.TestAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			// Create with minimal configuration
+			{
+				Config: fmt.Sprintf(utils_test.ProviderConfig+`
+resource "%s" "repo" {
+  name = "%s"
+  online = true
+  storage = {
+    blob_store_name = "default"
+    strict_content_type_validation = true
+  }
+  proxy = {
+    remote_url = "https://download.eclipse.org/releases/2025-06"
+    content_max_age = 1440
+    metadata_max_age = 1440
+  }
+  negative_cache = {
+    enabled = true
+    time_to_live = 1440
+  }
+  http_client = {
+    blocked = false
+    auto_block = true
+  }
+}
+`, resourceType, repoName),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "name", repoName),
+					resource.TestCheckResourceAttr(resourceName, "online", "true"),
+				),
+			},
+			// Import and verify no changes
+			{
+				ResourceName:                         resourceName,
+				ImportState:                          true,
+				ImportStateVerify:                    true,
+				ImportStateId:                        repoName,
+				ImportStateVerifyIdentifierAttribute: "name",
+				ImportStateVerifyIgnore:              []string{"last_updated"},
+			},
+		},
+	})
+}