Merge pull request #294 from ulucinar/no-fork

Add NoFork External Connectors & Clients

.golangci.yml

@@ -44,8 +44,7 @@ linters-settings:
     sections:
       - standard
       - default
-      - prefix(github.com/crossplane/crossplane-runtime)
-      - prefix(github.com/crossplane/crossplane)
+      - prefix(github.com/crossplane/upjet)
       - blank
       - dot
 

cmd/scraper/main.go

@@ -8,8 +8,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/crossplane/upjet/pkg/registry"
 	"gopkg.in/alecthomas/kingpin.v2"
+
+	"github.com/crossplane/upjet/pkg/registry"
 )
 
 func main() {

go.mod

@@ -14,6 +14,7 @@ require (
 	github.com/fatih/camelcase v1.0.0
 	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.6.0
+	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/hcl/v2 v2.14.1
 	github.com/hashicorp/terraform-json v0.14.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0
@@ -27,6 +28,7 @@ require (
 	github.com/tmccombs/hcl2json v0.3.3
 	github.com/yuin/goldmark v1.4.13
 	github.com/zclconf/go-cty v1.11.0
+	github.com/zclconf/go-cty-yaml v1.0.3
 	golang.org/x/net v0.15.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/yaml.v2 v2.4.0
@@ -57,6 +59,7 @@ require (
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/zapr v1.2.4 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
@@ -70,7 +73,6 @@ require (
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
 	github.com/hashicorp/go-hclog v1.2.1 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
@@ -103,6 +105,8 @@ require (
 	github.com/vmihailenco/tagparser v0.1.1 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
 	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/oauth2 v0.10.0 // indirect

go.sum

@@ -59,6 +59,7 @@ github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
 github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -108,6 +109,7 @@ github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo=
+github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA=
 github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
@@ -362,6 +364,8 @@ github.com/zclconf/go-cty v1.10.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uU
 github.com/zclconf/go-cty v1.11.0 h1:726SxLdi2SDnjY+BStqB9J1hNp4+2WlzyXLuimibIe0=
 github.com/zclconf/go-cty v1.11.0/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA=
 github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8=
+github.com/zclconf/go-cty-yaml v1.0.3 h1:og/eOQ7lvA/WWhHGFETVWNduJM7Rjsv2RRpx1sdFMLc=
+github.com/zclconf/go-cty-yaml v1.0.3/go.mod h1:9YLUH4g7lOhVWqUbctnVlZ5KLpg7JAprQNgxSZ1Gyxs=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -370,9 +374,15 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY=
 go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -597,6 +607,7 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

pkg/config/common.go

@@ -7,9 +7,10 @@ package config
 import (
 	"strings"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/crossplane/upjet/pkg/registry"
 	tjname "github.com/crossplane/upjet/pkg/types/name"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 const (
@@ -76,16 +77,17 @@ func DefaultResource(name string, terraformSchema *schema.Resource, terraformReg
 	}
 
 	r := &Resource{
-		Name:              name,
-		TerraformResource: terraformSchema,
-		MetaResource:      terraformRegistry,
-		ShortGroup:        group,
-		Kind:              kind,
-		Version:           "v1alpha1",
-		ExternalName:      NameAsIdentifier,
-		References:        map[string]Reference{},
-		Sensitive:         NopSensitive,
-		UseAsync:          true,
+		Name:                 name,
+		TerraformResource:    terraformSchema,
+		MetaResource:         terraformRegistry,
+		ShortGroup:           group,
+		Kind:                 kind,
+		Version:              "v1alpha1",
+		ExternalName:         NameAsIdentifier,
+		References:           map[string]Reference{},
+		Sensitive:            NopSensitive,
+		UseAsync:             true,
+		SchemaElementOptions: make(map[string]*SchemaElementOption),
 	}
 	for _, f := range opts {
 		f(r)

pkg/config/common_test.go

@@ -7,10 +7,11 @@ package config
 import (
 	"testing"
 
-	"github.com/crossplane/upjet/pkg/registry"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+	"github.com/crossplane/upjet/pkg/registry"
 )
 
 func TestDefaultResource(t *testing.T) {
@@ -32,14 +33,15 @@ func TestDefaultResource(t *testing.T) {
 				name: "aws_ec2_instance",
 			},
 			want: &Resource{
-				Name:         "aws_ec2_instance",
-				ShortGroup:   "ec2",
-				Kind:         "Instance",
-				Version:      "v1alpha1",
-				ExternalName: NameAsIdentifier,
-				References:   map[string]Reference{},
-				Sensitive:    NopSensitive,
-				UseAsync:     true,
+				Name:                 "aws_ec2_instance",
+				ShortGroup:           "ec2",
+				Kind:                 "Instance",
+				Version:              "v1alpha1",
+				ExternalName:         NameAsIdentifier,
+				References:           map[string]Reference{},
+				Sensitive:            NopSensitive,
+				UseAsync:             true,
+				SchemaElementOptions: SchemaElementOptions{},
 			},
 		},
 		"TwoSectionsName": {
@@ -48,14 +50,15 @@ func TestDefaultResource(t *testing.T) {
 				name: "aws_instance",
 			},
 			want: &Resource{
-				Name:         "aws_instance",
-				ShortGroup:   "aws",
-				Kind:         "Instance",
-				Version:      "v1alpha1",
-				ExternalName: NameAsIdentifier,
-				References:   map[string]Reference{},
-				Sensitive:    NopSensitive,
-				UseAsync:     true,
+				Name:                 "aws_instance",
+				ShortGroup:           "aws",
+				Kind:                 "Instance",
+				Version:              "v1alpha1",
+				ExternalName:         NameAsIdentifier,
+				References:           map[string]Reference{},
+				Sensitive:            NopSensitive,
+				UseAsync:             true,
+				SchemaElementOptions: SchemaElementOptions{},
 			},
 		},
 		"NameWithPrefixAcronym": {
@@ -64,14 +67,15 @@ func TestDefaultResource(t *testing.T) {
 				name: "aws_db_sql_server",
 			},
 			want: &Resource{
-				Name:         "aws_db_sql_server",
-				ShortGroup:   "db",
-				Kind:         "SQLServer",
-				Version:      "v1alpha1",
-				ExternalName: NameAsIdentifier,
-				References:   map[string]Reference{},
-				Sensitive:    NopSensitive,
-				UseAsync:     true,
+				Name:                 "aws_db_sql_server",
+				ShortGroup:           "db",
+				Kind:                 "SQLServer",
+				Version:              "v1alpha1",
+				ExternalName:         NameAsIdentifier,
+				References:           map[string]Reference{},
+				Sensitive:            NopSensitive,
+				UseAsync:             true,
+				SchemaElementOptions: SchemaElementOptions{},
 			},
 		},
 		"NameWithSuffixAcronym": {
@@ -80,14 +84,15 @@ func TestDefaultResource(t *testing.T) {
 				name: "aws_db_server_id",
 			},
 			want: &Resource{
-				Name:         "aws_db_server_id",
-				ShortGroup:   "db",
-				Kind:         "ServerID",
-				Version:      "v1alpha1",
-				ExternalName: NameAsIdentifier,
-				References:   map[string]Reference{},
-				Sensitive:    NopSensitive,
-				UseAsync:     true,
+				Name:                 "aws_db_server_id",
+				ShortGroup:           "db",
+				Kind:                 "ServerID",
+				Version:              "v1alpha1",
+				ExternalName:         NameAsIdentifier,
+				References:           map[string]Reference{},
+				Sensitive:            NopSensitive,
+				UseAsync:             true,
+				SchemaElementOptions: SchemaElementOptions{},
 			},
 		},
 		"NameWithMultipleAcronyms": {
@@ -96,14 +101,15 @@ func TestDefaultResource(t *testing.T) {
 				name: "aws_db_sql_server_id",
 			},
 			want: &Resource{
-				Name:         "aws_db_sql_server_id",
-				ShortGroup:   "db",
-				Kind:         "SQLServerID",
-				Version:      "v1alpha1",
-				ExternalName: NameAsIdentifier,
-				References:   map[string]Reference{},
-				Sensitive:    NopSensitive,
-				UseAsync:     true,
+				Name:                 "aws_db_sql_server_id",
+				ShortGroup:           "db",
+				Kind:                 "SQLServerID",
+				Version:              "v1alpha1",
+				ExternalName:         NameAsIdentifier,
+				References:           map[string]Reference{},
+				Sensitive:            NopSensitive,
+				UseAsync:             true,
+				SchemaElementOptions: SchemaElementOptions{},
 			},
 		},
 	}
@@ -113,6 +119,7 @@ func TestDefaultResource(t *testing.T) {
 		cmpopts.IgnoreFields(Sensitive{}, "fieldPaths", "AdditionalConnectionDetailsFn"),
 		cmpopts.IgnoreFields(LateInitializer{}, "ignoredCanonicalFieldPaths"),
 		cmpopts.IgnoreFields(ExternalName{}, "SetIdentifierArgumentFn", "GetExternalNameFn", "GetIDFn"),
+		cmpopts.IgnoreFields(Resource{}, "useNoForkClient"),
 	}
 
 	for name, tc := range cases {

pkg/config/externalname_test.go

@@ -8,10 +8,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
-
 	"github.com/crossplane/crossplane-runtime/pkg/errors"
 	"github.com/crossplane/crossplane-runtime/pkg/test"
+	"github.com/google/go-cmp/cmp"
 )
 
 func TestGetExternalNameFromTemplated(t *testing.T) {