Skip to content

Commit 4c6bfc2

Browse files
authored
Merge pull request #519 from erhancagirici/xp-v2-module-update
bump upjet go module to v2
2 parents 8ff6217 + d1183ac commit 4c6bfc2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+207
-205
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
PROJECT_NAME := upjet
1010
PROJECT_REPO := github.com/crossplane/$(PROJECT_NAME)
11+
GO_PROJECT := github.com/crossplane/$(PROJECT_NAME)/v2
1112

1213
# GOLANGCILINT_VERSION is inherited from build submodule by default.
1314
# Uncomment below if you need to override the version.

cmd/resolver/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/spf13/afero"
1414
"sigs.k8s.io/controller-runtime/pkg/log/zap"
1515

16-
"github.com/crossplane/upjet/pkg/transformers"
16+
"github.com/crossplane/upjet/v2/pkg/transformers"
1717
)
1818

1919
func main() {

cmd/scraper/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/alecthomas/kingpin/v2"
1212

13-
"github.com/crossplane/upjet/pkg/registry"
13+
"github.com/crossplane/upjet/v2/pkg/registry"
1414
)
1515

1616
func main() {

docs/configuring-a-resource.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ conditions:
116116

117117
```go
118118
import (
119-
"github.com/crossplane/upjet/pkg/config"
119+
"github.com/crossplane/upjet/v2/pkg/config"
120120
...
121121
)
122122

@@ -143,7 +143,7 @@ also omit `bucket` and `bucket_prefix` arguments from the spec with
143143

144144
```go
145145
import (
146-
"github.com/crossplane/upjet/pkg/config"
146+
"github.com/crossplane/upjet/v2/pkg/config"
147147
...
148148
)
149149

@@ -175,7 +175,7 @@ Here, we can just use [IdentifierFromProvider] configuration:
175175

176176
```go
177177
import (
178-
"github.com/crossplane/upjet/pkg/config"
178+
"github.com/crossplane/upjet/v2/pkg/config"
179179
...
180180
)
181181

@@ -206,7 +206,7 @@ this id back (`GetIDFn`).
206206

207207
```go
208208
import (
209-
"github.com/crossplane/upjet/pkg/config"
209+
"github.com/crossplane/upjet/v2/pkg/config"
210210
...
211211
)
212212

docs/generating-a-provider.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ variables in the `Makefile`:
141141
cat <<EOF > config/repository/config.go
142142
package repository
143143

144-
import "github.com/crossplane/upjet/pkg/config"
144+
import "github.com/crossplane/upjet/v2/pkg/config"
145145

146146
// Configure configures individual resources by adding custom ResourceConfigurators.
147147
func Configure(p *config.Provider) {
@@ -163,7 +163,7 @@ variables in the `Makefile`:
163163
cat <<EOF > config/branch/config.go
164164
package branch
165165

166-
import "github.com/crossplane/upjet/pkg/config"
166+
import "github.com/crossplane/upjet/v2/pkg/config"
167167

168168
func Configure(p *config.Provider) {
169169
p.AddResourceConfigurator("github_branch", func(r *config.Resource) {

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// SPDX-License-Identifier: CC0-1.0
44

5-
module github.com/crossplane/upjet
5+
module github.com/crossplane/upjet/v2
66

77
go 1.24.0
88

pkg/config/canonical.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package config
77
import (
88
"github.com/pkg/errors"
99

10-
"github.com/crossplane/upjet/pkg/resource/json"
10+
"github.com/crossplane/upjet/v2/pkg/resource/json"
1111
)
1212

1313
const (

pkg/config/common.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
fwresource "github.com/hashicorp/terraform-plugin-framework/resource"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1212

13-
"github.com/crossplane/upjet/pkg/config/conversion"
14-
"github.com/crossplane/upjet/pkg/registry"
15-
tjname "github.com/crossplane/upjet/pkg/types/name"
13+
"github.com/crossplane/upjet/v2/pkg/config/conversion"
14+
"github.com/crossplane/upjet/v2/pkg/registry"
15+
tjname "github.com/crossplane/upjet/v2/pkg/types/name"
1616
)
1717

1818
const (

pkg/config/common_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
fwresource "github.com/hashicorp/terraform-plugin-framework/resource"
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1515

16-
"github.com/crossplane/upjet/pkg/config/conversion"
17-
"github.com/crossplane/upjet/pkg/registry"
16+
"github.com/crossplane/upjet/v2/pkg/config/conversion"
17+
"github.com/crossplane/upjet/v2/pkg/registry"
1818
)
1919

2020
func TestDefaultResource(t *testing.T) {

pkg/config/provider.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1616
"github.com/pkg/errors"
1717

18-
"github.com/crossplane/upjet/pkg/registry"
19-
"github.com/crossplane/upjet/pkg/schema/traverser"
20-
conversiontfjson "github.com/crossplane/upjet/pkg/types/conversion/tfjson"
18+
"github.com/crossplane/upjet/v2/pkg/registry"
19+
"github.com/crossplane/upjet/v2/pkg/schema/traverser"
20+
conversiontfjson "github.com/crossplane/upjet/v2/pkg/types/conversion/tfjson"
2121
)
2222

2323
// ResourceConfiguratorFn is a function that implements the ResourceConfigurator

0 commit comments

Comments
 (0)