Skip to content

Commit 77c940a

Browse files
erikzaadierikzaadi
committed
Upgrade entire go package to v2
1 parent 51e7e6a commit 77c940a

Some content is hidden

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

60 files changed

+181
-181
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/port-labs/terraform-provider-port-labs
1+
module github.com/port-labs/terraform-provider-port-labs/v2
22

33
go 1.18
44

‎internal/acctest/acctest.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"github.com/hashicorp/terraform-plugin-framework/providerserver"
99
"github.com/hashicorp/terraform-plugin-go/tfprotov6"
10-
"github.com/port-labs/terraform-provider-port-labs/internal/consts"
11-
"github.com/port-labs/terraform-provider-port-labs/provider"
10+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/consts"
11+
"github.com/port-labs/terraform-provider-port-labs/v2/provider"
1212
)
1313

1414
var (

‎main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"log"
77

88
"github.com/hashicorp/terraform-plugin-framework/providerserver"
9-
"github.com/port-labs/terraform-provider-port-labs/provider"
9+
"github.com/port-labs/terraform-provider-port-labs/v2/provider"
1010
)
1111

1212
func main() {

‎port/action-permissions/actionPermissionToPortBody.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package action_permissions
22

33
import (
4-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
5-
"github.com/port-labs/terraform-provider-port-labs/internal/flex"
6-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
4+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
5+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/flex"
6+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
77
)
88

99
func actionPermissionsToPortBody(state *PermissionsModel) (*cli.ActionPermissions, error) {

‎port/action-permissions/refreshActionPermissionsToState.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package action_permissions
33
import (
44
"encoding/json"
55
"github.com/hashicorp/terraform-plugin-framework/types"
6-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
7-
"github.com/port-labs/terraform-provider-port-labs/internal/flex"
6+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
7+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/flex"
88
)
99

1010
func refreshActionPermissionsState(state *ActionPermissionsModel, a *cli.ActionPermissions, actionId string) error {

‎port/action-permissions/resource.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/hashicorp/terraform-plugin-framework/path"
77
"github.com/hashicorp/terraform-plugin-framework/resource"
88
"github.com/hashicorp/terraform-plugin-framework/types"
9-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
9+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
1010
)
1111

1212
var _ resource.Resource = &ActionPermissionsResource{}

‎port/action-permissions/resource_test.go

+24-24
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"testing"
66

77
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
8-
"github.com/port-labs/terraform-provider-port-labs/internal/acctest"
9-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
8+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/acctest"
9+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
1010
)
1111

1212
func testAccCreateBlueprintAndActionConfig(blueprintIdentifier string, actionIdentifier string) string {
@@ -178,13 +178,13 @@ func TestAccPortActionPermissionsWithPolicy(t *testing.T) {
178178
permissions = {
179179
"execute": {
180180
"roles": [
181-
"Member",
182-
],
181+
"Member",
182+
],
183183
"users": [],
184184
"teams": [],
185185
"owned_by_team": false
186-
},
187-
"approve": {
186+
},
187+
"approve": {
188188
"roles": [],
189189
"users": [],
190190
"teams": [],
@@ -226,13 +226,13 @@ func TestAccPortActionPermissionsWithPolicy(t *testing.T) {
226226
permissions = {
227227
"execute": {
228228
"roles": [
229-
"Member",
230-
],
229+
"Member",
230+
],
231231
"users": [],
232232
"teams": [],
233233
"owned_by_team": false
234-
},
235-
"approve": {
234+
},
235+
"approve": {
236236
"roles": [],
237237
"users": [],
238238
"teams": []
@@ -286,13 +286,13 @@ func TestAccPortActionPermissionsWithPolicyUpdate(t *testing.T) {
286286
permissions = {
287287
"execute": {
288288
"roles": [
289-
"Member",
290-
],
289+
"Member",
290+
],
291291
"users": [],
292292
"teams": [],
293293
"owned_by_team": false
294-
},
295-
"approve": {
294+
},
295+
"approve": {
296296
"roles": [],
297297
"users": [],
298298
"teams": [],
@@ -334,13 +334,13 @@ func TestAccPortActionPermissionsWithPolicyUpdate(t *testing.T) {
334334
permissions = {
335335
"execute": {
336336
"roles": [
337-
"Member",
338-
],
337+
"Member",
338+
],
339339
"users": [],
340340
"teams": [],
341341
"owned_by_team": false
342-
},
343-
"approve": {
342+
},
343+
"approve": {
344344
"roles": [],
345345
"users": [],
346346
"teams": [],
@@ -370,9 +370,9 @@ func TestAccPortActionPermissionsWithPolicyUpdate(t *testing.T) {
370370
}
371371
},
372372
conditions: [
373-
"true"]
373+
"true"]
374374
})
375-
}
375+
}
376376
}
377377
}`
378378
resource.Test(t, resource.TestCase{
@@ -422,13 +422,13 @@ func TestAccPortActionPermissionsImportState(t *testing.T) {
422422
permissions = {
423423
"execute": {
424424
"roles": [
425-
"Member",
426-
],
425+
"Member",
426+
],
427427
"users": [],
428428
"teams": [],
429429
"owned_by_team": false
430-
},
431-
"approve": {
430+
},
431+
"approve": {
432432
"roles": [],
433433
"users": [],
434434
"teams": [],

‎port/action/actionStateToPortBody.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package action
22

33
import (
44
"context"
5-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
6-
"github.com/port-labs/terraform-provider-port-labs/internal/consts"
7-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
5+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
6+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/consts"
7+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
88
)
99

1010
func actionDataSetToPortBody(dataSet *DatasetModel) *cli.Dataset {

‎port/action/array.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"github.com/hashicorp/terraform-plugin-framework/attr"
99
"github.com/hashicorp/terraform-plugin-framework/types"
1010
"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
11-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
12-
"github.com/port-labs/terraform-provider-port-labs/internal/flex"
13-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
11+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
12+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/flex"
13+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
1414
)
1515

1616
func handleArrayItemsToBody(ctx context.Context, property *cli.ActionProperty, prop ArrayPropModel, required *[]string) error {

‎port/action/boolean.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package action
33
import (
44
"context"
55

6-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
7-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
6+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
7+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
88
)
99

1010
func booleanPropResourceToBody(ctx context.Context, d *SelfServiceTriggerModel, props map[string]cli.ActionProperty, required *[]string) error {

‎port/action/number.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/hashicorp/terraform-plugin-framework/attr"
88
"github.com/hashicorp/terraform-plugin-framework/types"
99
"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
10-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
11-
"github.com/port-labs/terraform-provider-port-labs/internal/flex"
12-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
10+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
11+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/flex"
12+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
1313
)
1414

1515
func numberPropResourceToBody(ctx context.Context, state *SelfServiceTriggerModel, props map[string]cli.ActionProperty, required *[]string) error {

‎port/action/object.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"context"
55
"encoding/json"
66

7-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
8-
"github.com/port-labs/terraform-provider-port-labs/internal/flex"
9-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
7+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
8+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/flex"
9+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
1010
)
1111

1212
func objectPropResourceToBody(ctx context.Context, d *SelfServiceTriggerModel, props map[string]cli.ActionProperty, required *[]string) error {

‎port/action/refreshActionState.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"github.com/samber/lo"
99

1010
"github.com/hashicorp/terraform-plugin-framework/types"
11-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
12-
"github.com/port-labs/terraform-provider-port-labs/internal/consts"
13-
"github.com/port-labs/terraform-provider-port-labs/internal/flex"
14-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
11+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
12+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/consts"
13+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/flex"
14+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
1515
)
1616

1717
func writeInvocationMethodToResource(ctx context.Context, a *cli.Action, state *ActionModel) error {

‎port/action/resource.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/hashicorp/terraform-plugin-framework/path"
88
"github.com/hashicorp/terraform-plugin-framework/resource"
99
"github.com/hashicorp/terraform-plugin-framework/types"
10-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
10+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
1111
)
1212

1313
var _ resource.Resource = &ActionResource{}

‎port/action/resource_test.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77

88
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
9-
"github.com/port-labs/terraform-provider-port-labs/internal/acctest"
10-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
9+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/acctest"
10+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
1111
)
1212

1313
func testAccCreateBlueprintConfig(identifier string) string {
@@ -76,7 +76,7 @@ func TestAccPortAction(t *testing.T) {
7676
"myStringIdentifier" = {
7777
"title" = "My String Identifier"
7878
"required" = true
79-
79+
8080
}
8181
}
8282
"number_props" = {
@@ -752,7 +752,7 @@ func TestAccPortActionEnumJqQuery(t *testing.T) {
752752
enum_jq_query = "[1, 2]"
753753
}
754754
}
755-
755+
756756
}
757757
}
758758
}
@@ -1212,7 +1212,7 @@ func TestAccPortActionRequiredConflictsWithRequiredJQ(t *testing.T) {
12121212
self_service_trigger = {
12131213
operation = "DAY-2"
12141214
blueprint_identifier = port_blueprint.microservice.identifier
1215-
user_properties = {
1215+
user_properties = {
12161216
"string_props" = {
12171217
"equalsOne" = {
12181218
"title" = "equalsOne"
@@ -1313,13 +1313,13 @@ func TestAccPortActionRequiredFalseAndNull(t *testing.T) {
13131313
self_service_trigger = {
13141314
operation = "DAY-2"
13151315
blueprint_identifier = port_blueprint.microservice.identifier
1316-
user_properties = {
1316+
user_properties = {
13171317
"string_props" = {
13181318
"notRequiredExist" = {
13191319
"title" = "notEqualsOne"
13201320
}
13211321
"requiredTrue" = {
1322-
"title" = "notEqualsOne"
1322+
"title" = "notEqualsOne"
13231323
"required" = true
13241324
}
13251325
}
@@ -1684,25 +1684,25 @@ func TestAccPortActionNoUserPropertiesConditional(t *testing.T) {
16841684
title = "Prop"
16851685
}
16861686
} : null
1687-
1687+
16881688
number_props = port_blueprint.microservice.identifier == "notTheRealIdentifier" ? {
16891689
numProp = {
16901690
title = "Prop"
16911691
}
16921692
} : null
1693-
1693+
16941694
boolean_props = port_blueprint.microservice.identifier == "notTheRealIdentifier" ? {
16951695
boolProp = {
16961696
title = "Prop"
16971697
}
16981698
} : null
1699-
1699+
17001700
object_props = port_blueprint.microservice.identifier == "notTheRealIdentifier" ? {
17011701
objProp = {
17021702
title = "Prop"
17031703
}
17041704
} : null
1705-
1705+
17061706
array_props = port_blueprint.microservice.identifier == "notTheRealIdentifier" ? {
17071707
arrProp = {
17081708
title = "Prop"

‎port/action/schema.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/hashicorp/terraform-plugin-framework/schema/validator"
1919
"github.com/hashicorp/terraform-plugin-framework/types"
2020
"github.com/hashicorp/terraform-plugin-go/tftypes"
21-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
21+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
2222
"regexp"
2323
)
2424

‎port/action/string.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/hashicorp/terraform-plugin-framework/attr"
88
"github.com/hashicorp/terraform-plugin-framework/types"
99
"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
10-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
11-
"github.com/port-labs/terraform-provider-port-labs/internal/flex"
12-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
10+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
11+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/flex"
12+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
1313
)
1414

1515
func stringPropResourceToBody(ctx context.Context, d *SelfServiceTriggerModel, props map[string]cli.ActionProperty, required *[]string) error {

‎port/aggregation-properties/readStateToPortBody.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package aggregation_properties
22

33
import (
4-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
5-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
4+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
5+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
66
)
77

88
func aggregationPropertiesToBody(state *AggregationPropertiesModel) (*map[string]cli.BlueprintAggregationProperty, error) {

‎port/aggregation-properties/refreshAggregationPropertyToState.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package aggregation_properties
22

33
import (
44
"github.com/hashicorp/terraform-plugin-framework/types"
5-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
6-
"github.com/port-labs/terraform-provider-port-labs/internal/utils"
5+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
6+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
77
)
88

99
func refreshAggregationPropertiesState(state *AggregationPropertiesModel, aggregationProperties map[string]cli.BlueprintAggregationProperty) error {

‎port/aggregation-properties/resource.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"github.com/hashicorp/terraform-plugin-framework/path"
66
"github.com/hashicorp/terraform-plugin-framework/resource"
7-
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
7+
"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
88
)
99

1010
var _ resource.Resource = &AggregationPropertiesResource{}

0 commit comments

Comments
 (0)