Migrate project user and role and repo to Plugin Framework

CHANGELOG.md

@@ -1,8 +1,9 @@
-## 1.6.2 (June 3, 2024)
+## 1.6.2 (June 4, 2024)
 
 IMPROVEMENTS:
 
 * resource/project_group is migrated to Plugin Framework. PR: [#131](https://github.com/jfrog/terraform-provider-project/pull/131)
+* resource/project_user, resource/project_role, and resource/project_repository are migrated to Plugin Framework. PR: [#133](https://github.com/jfrog/terraform-provider-project/pull/133)
 
 ## 1.6.1 (May 31, 2024)
 

go.mod

@@ -9,13 +9,14 @@ require (
  github.com/hashicorp/terraform-plugin-framework v1.8.0
  github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
  github.com/hashicorp/terraform-plugin-log v0.9.0
- github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
  github.com/hashicorp/terraform-plugin-testing v1.8.0
- github.com/jfrog/terraform-provider-shared v1.25.3
+ github.com/jfrog/terraform-provider-shared v1.25.4
  github.com/samber/lo v1.39.0
  golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
 )
 
+require github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 // indirect
+
 require (
  github.com/BurntSushi/toml v1.2.1 // indirect
  github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect
@@ -28,6 +29,7 @@ require (
  github.com/armon/go-radix v1.0.0 // indirect
  github.com/bgentry/speakeasy v0.1.0 // indirect
  github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
+ github.com/cenkalti/backoff/v4 v4.3.0
  github.com/cloudflare/circl v1.3.7 // indirect
  github.com/fatih/color v1.16.0 // indirect
  github.com/golang/protobuf v1.5.4 // indirect
@@ -50,7 +52,6 @@ require (
  github.com/hashicorp/terraform-exec v0.21.0 // indirect
  github.com/hashicorp/terraform-json v0.22.1 // indirect
  github.com/hashicorp/terraform-plugin-go v0.23.0
- github.com/hashicorp/terraform-plugin-mux v0.16.0
  github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
  github.com/hashicorp/terraform-svchost v0.1.1 // indirect
  github.com/hashicorp/yamux v0.1.1 // indirect
@@ -85,9 +86,7 @@ require (
  google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
  google.golang.org/grpc v1.63.2 // indirect
  google.golang.org/protobuf v1.34.0 // indirect
- gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
  gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
- gopkg.in/ldap.v2 v2.5.1 // indirect
  gopkg.in/yaml.v2 v2.3.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -27,6 +27,8 @@ github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwN
 github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
+github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
+github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
 github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
@@ -111,10 +113,8 @@ github.com/hashicorp/terraform-plugin-go v0.23.0 h1:AALVuU1gD1kPb48aPQUjug9Ir/12
 github.com/hashicorp/terraform-plugin-go v0.23.0/go.mod h1:1E3Cr9h2vMlahWMbsSEcNrOCxovCZhOOIXjFHbjc/lQ=
 github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0=
 github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow=
-github.com/hashicorp/terraform-plugin-mux v0.16.0 h1:RCzXHGDYwUwwqfYYWJKBFaS3fQsWn/ZECEiW7p2023I=
-github.com/hashicorp/terraform-plugin-mux v0.16.0/go.mod h1:PF79mAsPc8CpusXPfEVa4X8PtkB+ngWoiUClMrNZlYo=
-github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0 h1:kJiWGx2kiQVo97Y5IOGR4EMcZ8DtMswHhUuFibsCQQE=
-github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0/go.mod h1:sl/UoabMc37HA6ICVMmGO+/0wofkVIRxf+BMb/dnoIg=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 h1:qHprzXy/As0rxedphECBEQAh3R4yp6pKksKHcqZx5G8=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0/go.mod h1:H+8tjs9TjV2w57QFVSMBQacf8k/E1XwLXGCARgViC6A=
 github.com/hashicorp/terraform-plugin-testing v1.8.0 h1:wdYIgwDk4iO933gC4S8KbKdnMQShu6BXuZQPScmHvpk=
 github.com/hashicorp/terraform-plugin-testing v1.8.0/go.mod h1:o2kOgf18ADUaZGhtOl0YCkfIxg01MAiMATT2EtIHlZk=
 github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI=
@@ -130,8 +130,8 @@ github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
 github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jfrog/terraform-provider-shared v1.25.3 h1:0P1H5WkNmhrXvXAo5pY1XkVn81CkZxcttDqZTESlKBw=
-github.com/jfrog/terraform-provider-shared v1.25.3/go.mod h1:QthwPRUALElMt2RTGqoeB/3Vztx626YPBzIAoqEp0w0=
+github.com/jfrog/terraform-provider-shared v1.25.4 h1:+rx+/7dbJPNzdGs5rNIHtHvN+9TlbHuqGr+/idW2ozw=
+github.com/jfrog/terraform-provider-shared v1.25.4/go.mod h1:QthwPRUALElMt2RTGqoeB/3Vztx626YPBzIAoqEp0w0=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
 github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
@@ -301,14 +301,10 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
 google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
-gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/ldap.v2 v2.5.1 h1:wiu0okdNfjlBzg6UWvd1Hn8Y+Ux17/u/4nlk4CQr6tU=
-gopkg.in/ldap.v2 v2.5.1/go.mod h1:oI0cpe/D7HRtBQl8aTg+ZmzFUAvu4lsv3eLXMLGFxWk=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

main.go

@@ -6,10 +6,6 @@ import (
  "log"
 
  "github.com/hashicorp/terraform-plugin-framework/providerserver"
- "github.com/hashicorp/terraform-plugin-go/tfprotov6"
- "github.com/hashicorp/terraform-plugin-go/tfprotov6/tf6server"
- "github.com/hashicorp/terraform-plugin-mux/tf5to6server"
- "github.com/hashicorp/terraform-plugin-mux/tf6muxserver"
  provider "github.com/jfrog/terraform-provider-project/pkg/project/provider"
 )
 
@@ -18,46 +14,18 @@ import (
 //go:generate go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
 
 func main() {
- ctx := context.Background()
-
  var debug bool
 
  flag.BoolVar(&debug, "debug", false, "set to true to run the provider with support for debuggers like delve")
  flag.Parse()
 
- upgradedSdkServer, err := tf5to6server.UpgradeServer(
- ctx,
- provider.SdkV2().GRPCProvider, // terraform-plugin-sdk provider
- )
- if err != nil {
- log.Fatal(err)
- }
-
- providers := []func() tfprotov6.ProviderServer{
- providerserver.NewProtocol6(provider.Framework()()), // terraform-plugin-framework provider
- func() tfprotov6.ProviderServer {
- return upgradedSdkServer
- },
- }
-
- muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...)
- if err != nil {
- log.Fatal(err)
- }
-
- var serveOpts []tf6server.ServeOpt
-
- if debug {
- serveOpts = append(serveOpts, tf6server.WithManagedDebug())
+ opts := providerserver.ServeOpts{
+ // TODO: Update this string with the published name of your provider.
+ Address: "registry.terraform.io/jfrog/project",
+ Debug: debug,
  }
-
- err = tf6server.Serve(
- "registry.terraform.io/jfrog/project",
- muxServer.ProviderServer,
- serveOpts...,
- )
-
+ err := providerserver.Serve(context.Background(), provider.Framework(), opts)
  if err != nil {
- log.Fatal(err)
+ log.Fatal(err.Error())
  }
 }

pkg/project/acctest/test.go

@@ -1,7 +1,6 @@
 package acctest
 
 import (
- "context"
  "fmt"
  "math/rand"
  "net/http"
@@ -10,23 +9,15 @@ import (
  "testing"
 
  "github.com/go-resty/resty/v2"
+ "github.com/hashicorp/terraform-plugin-framework/provider"
  "github.com/hashicorp/terraform-plugin-framework/providerserver"
  "github.com/hashicorp/terraform-plugin-go/tfprotov6"
- "github.com/hashicorp/terraform-plugin-mux/tf5to6server"
- "github.com/hashicorp/terraform-plugin-mux/tf6muxserver"
- "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
- terraform2 "github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
  "github.com/hashicorp/terraform-plugin-testing/terraform"
- "github.com/jfrog/terraform-provider-project/pkg/project/provider"
+ project "github.com/jfrog/terraform-provider-project/pkg/project/provider"
  "github.com/jfrog/terraform-provider-shared/client"
  "github.com/jfrog/terraform-provider-shared/testutil"
- "github.com/jfrog/terraform-provider-shared/util"
 )
 
-// Provider PreCheck(t) must be called before using this provider instance.
-var Provider *schema.Provider
-var ProviderFactories map[string]func() (*schema.Provider, error)
-
 // testAccProviderConfigure ensures Provider is only configured once
 //
 // The PreCheck(t) function is invoked for every test and this prevents
@@ -35,50 +26,15 @@ var ProviderFactories map[string]func() (*schema.Provider, error)
 // Provider be errantly reused in ProviderFactories.
 var testAccProviderConfigure sync.Once
 
-// ProtoV6MuxProviderFactories is used to instantiate both SDK v2 and Framework providers
-// during acceptance tests. Use it only if you need to combine resources from SDK v2 and the Framework in the same test.
-var ProtoV6MuxProviderFactories map[string]func() (tfprotov6.ProviderServer, error)
+var Provider provider.Provider
 
 var ProtoV6ProviderFactories map[string]func() (tfprotov6.ProviderServer, error)
 
 func init() {
- Provider = provider.SdkV2()
-
- ProviderFactories = map[string]func() (*schema.Provider, error){
- "project": func() (*schema.Provider, error) { return Provider, nil },
- }
+ Provider = project.Framework()()
 
  ProtoV6ProviderFactories = map[string]func() (tfprotov6.ProviderServer, error){
- "project": providerserver.NewProtocol6WithError(provider.Framework()()),
- }
-
- ProtoV6MuxProviderFactories = map[string]func() (tfprotov6.ProviderServer, error){
- "project": func() (tfprotov6.ProviderServer, error) {
- ctx := context.Background()
-
- upgradedSdkServer, err := tf5to6server.UpgradeServer(
- ctx,
- provider.SdkV2().GRPCProvider, // terraform-plugin-sdk provider
- )
- if err != nil {
- return nil, err
- }
-
- providers := []func() tfprotov6.ProviderServer{
- providerserver.NewProtocol6(provider.Framework()()), // terraform-plugin-framework provider
- func() tfprotov6.ProviderServer {
- return upgradedSdkServer
- },
- }
-
- muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...)
-
- if err != nil {
- return nil, err
- }
-
- return muxServer.ProviderServer(), nil
- },
+ "project": providerserver.NewProtocol6WithError(Provider),
  }
 }
 
@@ -99,11 +55,6 @@ func PreCheck(t *testing.T) {
  if err != nil {
  t.Fatalf("failed to set custom base URL: %v", err)
  }
-
- configErr := Provider.Configure(context.Background(), (*terraform2.ResourceConfig)(terraform2.NewResourceConfigRaw(nil)))
- if configErr != nil && configErr.HasError() {
- t.Fatalf("failed to configure provider %v", configErr)
- }
  })
 }
 
@@ -120,7 +71,7 @@ func VerifyDeleted(id string, check CheckFun) func(*terraform.State) error {
  return fmt.Errorf("error: Resource id [%s] not found", id)
  }
 
- client := Provider.Meta().(util.ProviderMetadata).Client
+ client := Provider.(*project.ProjectProvider).Meta.Client
  resp, err := check(rs.Primary.ID, client.R())
  if err != nil {
  return err

pkg/project/provider/framework.go

@@ -20,7 +20,9 @@ import (
 // Ensure the implementation satisfies the provider.Provider interface.
 var _ provider.Provider = &ProjectProvider{}
 
-type ProjectProvider struct{}
+type ProjectProvider struct {
+ Meta util.ProviderMetadata
+}
 
 // ProjectProviderModel describes the provider data model.
 type ProjectProviderModel struct {
@@ -173,6 +175,8 @@ func (p *ProjectProvider) Configure(ctx context.Context, req provider.ConfigureR
  ArtifactoryVersion: version,
  }
 
+ p.Meta = meta
+
  resp.DataSourceData = meta
  resp.ResourceData = meta
 }
@@ -183,6 +187,9 @@ func (p *ProjectProvider) Resources(ctx context.Context) []func() resource.Resou
  project.NewProjectResource,
  project.NewProjectEnvironmentResource,
  project.NewProjectGroupResource,
+ project.NewProjectRepositoryResource,
+ project.NewProjectRoleResource,
+ project.NewProjectUserResource,
  }
 }