Merge branch 'main' into prepare-publish-configs

Author: elliotxx

.golangci.yml

@@ -0,0 +1,24 @@
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
+
+linters:
+  disable-all: true
+  enable:
+    - durationcheck
+    - errcheck
+    - copyloopvar
+    - godot
+    - gofmt
+    - gosimple
+    - ineffassign
+    - makezero
+    - misspell
+    - nilerr
+    - predeclared
+    - staticcheck
+    - tenv
+    - unconvert
+    - unparam
+    - unused
+    - govet

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build install test testacc
+.PHONY: build install test testacc doc lint
 
 build:
 	@go build -o terraform-provider-karpor
@@ -7,8 +7,15 @@ install: build
 	@mkdir -p ~/.terraform.d/plugins/registry.terraform.io/KusionStack/karpor/0.1.0/darwin_amd64
 	@mv terraform-provider-karpor ~/.terraform.d/plugins/registry.terraform.io/KusionStack/karpor/0.1.0/darwin_amd64
 
+lint:  
+	@which golangci-lint > /dev/null || (echo "Installing golangci-lint@latest ..."; $(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@latest && echo -e "Installation complete!\n")
+	golangci-lint run ././... --fast --verbose --print-resources-usage
+
 test:
 	@go test -v ./...
 
+doc: 
+	@cd tools && go generate ./...
+
 testacc:
 	@TF_ACC=1 go test -v ./...

README.md

@@ -36,7 +36,6 @@ provider "karpor" {
 ```hcl
 resource "karpor_cluster_registration" "production" {
   cluster_name    = "production-cluster"
-  api_server_url  = "https://k8s.example.com"
   credentials     = file("~/.kube/config")
   description     = "Primary production cluster"
 }
@@ -58,7 +57,7 @@ make testacc  # Run acceptance tests (requires API credentials)
 ### Test Configuration
 Set environment variables before testing:
 ```bash
-export KARPOR_ENDPOINT="https://api.karpor.example.com"
+export KARPOR_API_ENDPOINT="https://api.karpor.example.com"
 export KARPOR_API_KEY="your-api-key"
 ```
 

docs/data-sources/cluster.md

@@ -0,0 +1,26 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "karpor_cluster Data Source - karpor"
+subcategory: ""
+description: |-
+  
+---
+
+# karpor_cluster (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `cluster_name` (String)
+
+### Read-Only
+
+- `description` (String)
+- `display_name` (String)
+- `id` (String) The ID of this resource.

docs/index.md

@@ -0,0 +1,38 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "karpor Provider"
+subcategory: ""
+description: |-
+  
+---
+
+# karpor Provider
+
+
+
+## Example Usage
+
+```terraform
+terraform {
+  required_providers {
+    karpor = {
+      source  = "registry.terraform.io/KusionStack/karpor"
+      version = "0.1.0"
+    }
+  }
+}
+
+provider "karpor" {
+  api_endpoint = "https://api.karpor.example.com"
+  api_key      = "your-api-key-here"
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Optional
+
+- `api_endpoint` (String) Karpor API endpoint URL
+- `api_key` (String, Sensitive) API key for authentication
+- `skip_tls_verify` (Boolean) Skip TLS verification, by default it is false

docs/resources/cluster_registration.md

@@ -1,27 +1,31 @@
-# karpor_cluster_registration
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "karpor_cluster_registration Resource - karpor"
+subcategory: ""
+description: |-
+  
+---
 
-Register and manage Kubernetes clusters in Karpor
+# karpor_cluster_registration (Resource)
 
-## Example Usage
 
-```hcl
-resource "karpor_cluster_registration" "example" {
-  cluster_name    = "production-cluster"
-  api_server_url  = "https://kubernetes.example.com"
-  credentials     = file("~/.kube/config")
-  description     = "Production Kubernetes cluster"
-}
-```
 
-## Argument Reference
 
-- `cluster_name` (Required) - Unique name for the cluster
-- `api_server_url` (Required) - Kubernetes API server URL
-- `credentials` (Required) - Path to kubeconfig file
-- `description` (Optional) - Human-readable description
 
-## Attributes Reference
+<!-- schema generated by tfplugindocs -->
+## Schema
 
-- `id` - Unique identifier for the registration
-- `registration_time` - Timestamp of registration
-- `health_status` - Current cluster health status
+### Required
+
+- `cluster_name` (String) Unique name for the cluster
+- `credentials` (String, Sensitive) Path to kubeconfig file
+
+### Optional
+
+- `description` (String) Human-readable description
+- `display_name` (String) Human-readable display name
+
+### Read-Only
+
+- `id` (String) Unique identifier
+- `last_updated` (String) Last updated timestamp

examples/data-source/data-source.tf

@@ -0,0 +1,31 @@
+terraform {
+  required_providers {
+    karpor = {
+      source  = "registry.terraform.io/KusionStack/karpor"
+      version = "0.1.0"
+    }
+  }
+}
+
+provider "karpor" {
+  api_endpoint    = "https://127.0.0.1:7443"
+  api_key         = "your-api-key-here"
+  skip_tls_verify = true
+}
+
+data "karpor_cluster" "example" {
+  cluster_name = "local-cluster"
+}
+
+output "cluster_name" {
+  value = data.karpor_cluster.example.cluster_name
+}
+
+output "display_name" {
+  value = data.karpor_cluster.example.display_name
+}
+
+output "description" {
+  value = data.karpor_cluster.example.description
+}
+

examples/provider/provider.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     karpor = {
-      source = "KusionStack/karpor"
+      source  = "registry.terraform.io/KusionStack/karpor"
       version = "0.1.0"
     }
   }
@@ -11,10 +11,3 @@ provider "karpor" {
   api_endpoint = "https://api.karpor.example.com"
   api_key      = "your-api-key-here"
 }
-
-resource "karpor_cluster_registration" "example" {
-  cluster_name    = "production-cluster"
-  api_server_url  = "https://kubernetes.example.com"
-  credentials     = file("~/.kube/config")
-  description     = "Production Kubernetes cluster"
-}

examples/resources/resource.tf

@@ -0,0 +1,30 @@
+terraform {
+  required_providers {
+    karpor = {
+      source  = "registry.terraform.io/KusionStack/karpor"
+      version = "0.1.0"
+    }
+  }
+}
+
+provider "karpor" {
+  api_endpoint    = "https://127.0.0.1:7443"
+  api_key         = "your-api-key-here"
+  skip_tls_verify = true
+}
+
+resource "karpor_cluster_registration" "example" {
+  cluster_name = "local-cluster"
+  display_name = "local-cluster-display-name"
+  credentials  = file("~/config")
+  description  = "Local Kubernetes cluster"
+}
+
+
+output "cluster_name" {
+  value = karpor_cluster_registration.example.cluster_name
+}
+
+output "display_name" {
+  value = karpor_cluster_registration.example.display_name
+}

go.mod

@@ -1,30 +1,62 @@
 module github.com/KusionStack/terraform-provider-karpor
 
-go 1.21
+go 1.22.7
 
-require github.com/hashicorp/terraform-plugin-framework v1.5.0
+require (
+	github.com/hashicorp/terraform-plugin-framework v1.13.0
+	github.com/hashicorp/terraform-plugin-go v0.26.0
+	github.com/hashicorp/terraform-plugin-log v0.9.0
+	github.com/hashicorp/terraform-plugin-testing v1.11.0
+)
 
 require (
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/hashicorp/go-hclog v1.5.0 // indirect
-	github.com/hashicorp/go-plugin v1.6.0 // indirect
+	github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
+	github.com/agext/levenshtein v1.2.2 // indirect
+	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/fatih/color v1.16.0 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
+	github.com/hashicorp/go-hclog v1.6.3 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-plugin v1.6.2 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/terraform-plugin-go v0.20.0 // indirect
-	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
-	github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
+	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/hashicorp/hc-install v0.9.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.23.0 // indirect
+	github.com/hashicorp/logutils v1.0.0 // indirect
+	github.com/hashicorp/terraform-exec v0.21.0 // indirect
+	github.com/hashicorp/terraform-json v0.23.0 // indirect
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0 // indirect
+	github.com/hashicorp/terraform-registry-address v0.2.4 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
+	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
-	google.golang.org/grpc v1.60.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	github.com/zclconf/go-cty v1.15.0 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
+	golang.org/x/mod v0.21.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
+	google.golang.org/grpc v1.69.4 // indirect
+	google.golang.org/protobuf v1.36.3 // indirect
 )