From 1fd35d6b3860146a5b8b26cc66d9a85fbda569c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20T=C3=BCrken?= Date: Thu, 26 Oct 2023 16:22:09 +0300 Subject: [PATCH] Replace upbound/upjet to crossplane/upjet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fatih Türken --- README.md | 8 ++++---- .../v1beta1/zz_generated_terraformed.go | 8 ++++++-- .../v1beta1/zz_groupversion_info.go | 4 ++++ apis/administrativeunits/v1beta1/zz_member_types.go | 4 ++++ apis/administrativeunits/v1beta1/zz_unit_types.go | 4 ++++ apis/app/v1beta1/zz_generated_terraformed.go | 8 ++++++-- apis/app/v1beta1/zz_groupversion_info.go | 4 ++++ apis/app/v1beta1/zz_roleassignment_types.go | 4 ++++ apis/applications/v1beta1/zz_application_types.go | 4 ++++ apis/applications/v1beta1/zz_certificate_types.go | 4 ++++ .../v1beta1/zz_federatedidentitycredential_types.go | 4 ++++ apis/applications/v1beta1/zz_generated.resolvers.go | 2 +- apis/applications/v1beta1/zz_generated_terraformed.go | 8 ++++++-- apis/applications/v1beta1/zz_groupversion_info.go | 4 ++++ apis/applications/v1beta1/zz_password_types.go | 4 ++++ apis/applications/v1beta1/zz_preauthorized_types.go | 6 +++++- .../conditionalaccess/v1beta1/zz_accesspolicy_types.go | 4 ++++ .../v1beta1/zz_generated_terraformed.go | 8 ++++++-- apis/conditionalaccess/v1beta1/zz_groupversion_info.go | 4 ++++ apis/conditionalaccess/v1beta1/zz_location_types.go | 4 ++++ .../v1beta1/zz_customdirectoryrole_types.go | 4 ++++ apis/directoryroles/v1beta1/zz_generated.resolvers.go | 2 +- .../directoryroles/v1beta1/zz_generated_terraformed.go | 8 ++++++-- apis/directoryroles/v1beta1/zz_groupversion_info.go | 4 ++++ apis/directoryroles/v1beta1/zz_role_types.go | 4 ++++ apis/directoryroles/v1beta1/zz_roleassignment_types.go | 6 +++++- apis/generate.go | 2 +- apis/groups/v1beta1/zz_generated_terraformed.go | 8 ++++++-- apis/groups/v1beta1/zz_group_types.go | 4 ++++ apis/groups/v1beta1/zz_groupversion_info.go | 4 ++++ apis/groups/v1beta1/zz_member_types.go | 4 ++++ apis/invitations/v1beta1/zz_generated_terraformed.go | 8 ++++++-- apis/invitations/v1beta1/zz_groupversion_info.go | 4 ++++ apis/invitations/v1beta1/zz_invitation_types.go | 4 ++++ apis/policies/v1beta1/zz_claimsmappingpolicy_types.go | 4 ++++ apis/policies/v1beta1/zz_generated_terraformed.go | 8 ++++++-- apis/policies/v1beta1/zz_groupversion_info.go | 4 ++++ .../v1beta1/zz_generated.resolvers.go | 2 +- .../v1beta1/zz_generated_terraformed.go | 8 ++++++-- .../v1beta1/zz_groupversion_info.go | 4 ++++ .../v1beta1/zz_permissiongrant_types.go | 6 +++++- apis/serviceprincipals/v1beta1/zz_certificate_types.go | 4 ++++ .../v1beta1/zz_claimsmappingpolicyassignment_types.go | 4 ++++ .../v1beta1/zz_generated.resolvers.go | 2 +- .../v1beta1/zz_generated_terraformed.go | 8 ++++++-- apis/serviceprincipals/v1beta1/zz_groupversion_info.go | 4 ++++ apis/serviceprincipals/v1beta1/zz_password_types.go | 4 ++++ apis/serviceprincipals/v1beta1/zz_principal_types.go | 6 +++++- .../v1beta1/zz_tokensigningcertificate_types.go | 4 ++++ .../v1beta1/zz_generated_terraformed.go | 8 ++++++-- apis/synchronization/v1beta1/zz_groupversion_info.go | 4 ++++ apis/synchronization/v1beta1/zz_job_types.go | 4 ++++ apis/synchronization/v1beta1/zz_secret_types.go | 4 ++++ apis/users/v1beta1/zz_generated_terraformed.go | 8 ++++++-- apis/users/v1beta1/zz_groupversion_info.go | 4 ++++ apis/users/v1beta1/zz_user_types.go | 4 ++++ apis/zz_register.go | 4 ++++ cmd/generator/main.go | 4 ++-- cmd/provider/main.go | 4 ++-- config/administrativeunits/config.go | 2 +- config/app/config.go | 2 +- config/applications/config.go | 4 ++-- config/conditionalaccess/config.go | 2 +- config/directoryroles/config.go | 4 ++-- config/external_name.go | 2 +- config/groups/config.go | 2 +- config/invitations/config.go | 2 +- config/policies/config.go | 2 +- config/provider.go | 4 ++-- config/serviceprincipaldelegated/config.go | 2 +- config/serviceprincipals/config.go | 4 ++-- config/synchronization/config.go | 2 +- config/users/config.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- internal/clients/azuread.go | 2 +- .../administrativeunits/member/zz_controller.go | 10 +++++++--- .../administrativeunits/unit/zz_controller.go | 10 +++++++--- .../controller/app/roleassignment/zz_controller.go | 10 +++++++--- .../applications/application/zz_controller.go | 10 +++++++--- .../applications/certificate/zz_controller.go | 10 +++++++--- .../federatedidentitycredential/zz_controller.go | 10 +++++++--- .../controller/applications/password/zz_controller.go | 10 +++++++--- .../applications/preauthorized/zz_controller.go | 10 +++++++--- .../conditionalaccess/accesspolicy/zz_controller.go | 10 +++++++--- .../conditionalaccess/location/zz_controller.go | 10 +++++++--- .../customdirectoryrole/zz_controller.go | 10 +++++++--- .../controller/directoryroles/role/zz_controller.go | 10 +++++++--- .../directoryroles/roleassignment/zz_controller.go | 10 +++++++--- internal/controller/groups/group/zz_controller.go | 10 +++++++--- internal/controller/groups/member/zz_controller.go | 10 +++++++--- .../controller/invitations/invitation/zz_controller.go | 10 +++++++--- .../policies/claimsmappingpolicy/zz_controller.go | 10 +++++++--- internal/controller/providerconfig/config.go | 2 +- .../permissiongrant/zz_controller.go | 10 +++++++--- .../serviceprincipals/certificate/zz_controller.go | 10 +++++++--- .../claimsmappingpolicyassignment/zz_controller.go | 10 +++++++--- .../serviceprincipals/password/zz_controller.go | 10 +++++++--- .../serviceprincipals/principal/zz_controller.go | 10 +++++++--- .../tokensigningcertificate/zz_controller.go | 10 +++++++--- .../controller/synchronization/job/zz_controller.go | 10 +++++++--- .../controller/synchronization/secret/zz_controller.go | 10 +++++++--- internal/controller/users/user/zz_controller.go | 10 +++++++--- internal/controller/zz_setup.go | 8 ++++---- 104 files changed, 454 insertions(+), 146 deletions(-) diff --git a/README.md b/README.md index 690d184b..ce9c5fee 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Provider Azuread is a [Crossplane](https://crossplane.io/) provider that -is built using [Upjet](https://github.com/upbound/upjet) code +is built using [Upjet](https://github.com/crossplane/upjet) code generation tools and exposes XRM-conformant managed resources for [Microsoft Azure Active Directory](https://azure.microsoft.com/en-us/products/active-directory/). @@ -19,13 +19,13 @@ You can find a detailed API reference for all the managed resources with example ## Contributing -For the general contribution guide, see [Upjet Contribution Guide](https://github.com/upbound/upjet/blob/main/CONTRIBUTING.md) +For the general contribution guide, see [Upjet Contribution Guide](https://github.com/crossplane/upjet/blob/main/CONTRIBUTING.md) -If you'd like to learn how to use Upjet, see [Usage Guide](https://github.com/upbound/upjet/tree/main/docs). +If you'd like to learn how to use Upjet, see [Usage Guide](https://github.com/crossplane/upjet/tree/main/docs). ### Add a New Resource -Follow the guide [here](https://github.com/upbound/upjet/blob/main/docs/add-new-resource-short.md). +Follow the guide [here](https://github.com/crossplane/upjet/blob/v0.10.0/docs/add-new-resource-short.md). ## Report a Bug diff --git a/apis/administrativeunits/v1beta1/zz_generated_terraformed.go b/apis/administrativeunits/v1beta1/zz_generated_terraformed.go index 9008d4eb..e8734935 100755 --- a/apis/administrativeunits/v1beta1/zz_generated_terraformed.go +++ b/apis/administrativeunits/v1beta1/zz_generated_terraformed.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -9,8 +13,8 @@ package v1beta1 import ( "github.com/pkg/errors" - "github.com/upbound/upjet/pkg/resource" - "github.com/upbound/upjet/pkg/resource/json" + "github.com/crossplane/upjet/pkg/resource" + "github.com/crossplane/upjet/pkg/resource/json" ) // GetTerraformResourceType returns Terraform resource type for this Unit diff --git a/apis/administrativeunits/v1beta1/zz_groupversion_info.go b/apis/administrativeunits/v1beta1/zz_groupversion_info.go index 6b651746..07a5f8a9 100755 --- a/apis/administrativeunits/v1beta1/zz_groupversion_info.go +++ b/apis/administrativeunits/v1beta1/zz_groupversion_info.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/administrativeunits/v1beta1/zz_member_types.go b/apis/administrativeunits/v1beta1/zz_member_types.go index 1d33c7dc..7f95f8f4 100755 --- a/apis/administrativeunits/v1beta1/zz_member_types.go +++ b/apis/administrativeunits/v1beta1/zz_member_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/administrativeunits/v1beta1/zz_unit_types.go b/apis/administrativeunits/v1beta1/zz_unit_types.go index 99ac5aec..6dc3fd7c 100755 --- a/apis/administrativeunits/v1beta1/zz_unit_types.go +++ b/apis/administrativeunits/v1beta1/zz_unit_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/app/v1beta1/zz_generated_terraformed.go b/apis/app/v1beta1/zz_generated_terraformed.go index f38da54b..4b3ba383 100755 --- a/apis/app/v1beta1/zz_generated_terraformed.go +++ b/apis/app/v1beta1/zz_generated_terraformed.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -9,8 +13,8 @@ package v1beta1 import ( "github.com/pkg/errors" - "github.com/upbound/upjet/pkg/resource" - "github.com/upbound/upjet/pkg/resource/json" + "github.com/crossplane/upjet/pkg/resource" + "github.com/crossplane/upjet/pkg/resource/json" ) // GetTerraformResourceType returns Terraform resource type for this RoleAssignment diff --git a/apis/app/v1beta1/zz_groupversion_info.go b/apis/app/v1beta1/zz_groupversion_info.go index 6368a46f..efe2a0df 100755 --- a/apis/app/v1beta1/zz_groupversion_info.go +++ b/apis/app/v1beta1/zz_groupversion_info.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/app/v1beta1/zz_roleassignment_types.go b/apis/app/v1beta1/zz_roleassignment_types.go index 3ff64048..2cb04198 100755 --- a/apis/app/v1beta1/zz_roleassignment_types.go +++ b/apis/app/v1beta1/zz_roleassignment_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/applications/v1beta1/zz_application_types.go b/apis/applications/v1beta1/zz_application_types.go index ce76478d..8716399d 100755 --- a/apis/applications/v1beta1/zz_application_types.go +++ b/apis/applications/v1beta1/zz_application_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/applications/v1beta1/zz_certificate_types.go b/apis/applications/v1beta1/zz_certificate_types.go index a34d980d..21b6f84f 100755 --- a/apis/applications/v1beta1/zz_certificate_types.go +++ b/apis/applications/v1beta1/zz_certificate_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/applications/v1beta1/zz_federatedidentitycredential_types.go b/apis/applications/v1beta1/zz_federatedidentitycredential_types.go index 27a7fe3a..52d26350 100755 --- a/apis/applications/v1beta1/zz_federatedidentitycredential_types.go +++ b/apis/applications/v1beta1/zz_federatedidentitycredential_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/applications/v1beta1/zz_generated.resolvers.go b/apis/applications/v1beta1/zz_generated.resolvers.go index 880028e7..1fd2329b 100644 --- a/apis/applications/v1beta1/zz_generated.resolvers.go +++ b/apis/applications/v1beta1/zz_generated.resolvers.go @@ -8,8 +8,8 @@ package v1beta1 import ( "context" reference "github.com/crossplane/crossplane-runtime/pkg/reference" + resource "github.com/crossplane/upjet/pkg/resource" errors "github.com/pkg/errors" - resource "github.com/upbound/upjet/pkg/resource" client "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/apis/applications/v1beta1/zz_generated_terraformed.go b/apis/applications/v1beta1/zz_generated_terraformed.go index 3646757c..dce78729 100755 --- a/apis/applications/v1beta1/zz_generated_terraformed.go +++ b/apis/applications/v1beta1/zz_generated_terraformed.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -9,8 +13,8 @@ package v1beta1 import ( "github.com/pkg/errors" - "github.com/upbound/upjet/pkg/resource" - "github.com/upbound/upjet/pkg/resource/json" + "github.com/crossplane/upjet/pkg/resource" + "github.com/crossplane/upjet/pkg/resource/json" ) // GetTerraformResourceType returns Terraform resource type for this Application diff --git a/apis/applications/v1beta1/zz_groupversion_info.go b/apis/applications/v1beta1/zz_groupversion_info.go index 5370dd03..5049adde 100755 --- a/apis/applications/v1beta1/zz_groupversion_info.go +++ b/apis/applications/v1beta1/zz_groupversion_info.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/applications/v1beta1/zz_password_types.go b/apis/applications/v1beta1/zz_password_types.go index 55f96c7e..c58ec6cf 100755 --- a/apis/applications/v1beta1/zz_password_types.go +++ b/apis/applications/v1beta1/zz_password_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/applications/v1beta1/zz_preauthorized_types.go b/apis/applications/v1beta1/zz_preauthorized_types.go index 629ae18b..53e7f5a0 100755 --- a/apis/applications/v1beta1/zz_preauthorized_types.go +++ b/apis/applications/v1beta1/zz_preauthorized_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -54,7 +58,7 @@ type PreAuthorizedParameters struct { // The application ID of the pre-authorized application // +crossplane:generate:reference:type=Application - // +crossplane:generate:reference:extractor=github.com/upbound/upjet/pkg/resource.ExtractParamPath("application_id",true) + // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractParamPath("application_id",true) // +kubebuilder:validation:Optional AuthorizedAppID *string `json:"authorizedAppId,omitempty" tf:"authorized_app_id,omitempty"` diff --git a/apis/conditionalaccess/v1beta1/zz_accesspolicy_types.go b/apis/conditionalaccess/v1beta1/zz_accesspolicy_types.go index 5d95b742..c335fcf9 100755 --- a/apis/conditionalaccess/v1beta1/zz_accesspolicy_types.go +++ b/apis/conditionalaccess/v1beta1/zz_accesspolicy_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/conditionalaccess/v1beta1/zz_generated_terraformed.go b/apis/conditionalaccess/v1beta1/zz_generated_terraformed.go index e0458bd9..4783a826 100755 --- a/apis/conditionalaccess/v1beta1/zz_generated_terraformed.go +++ b/apis/conditionalaccess/v1beta1/zz_generated_terraformed.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -9,8 +13,8 @@ package v1beta1 import ( "github.com/pkg/errors" - "github.com/upbound/upjet/pkg/resource" - "github.com/upbound/upjet/pkg/resource/json" + "github.com/crossplane/upjet/pkg/resource" + "github.com/crossplane/upjet/pkg/resource/json" ) // GetTerraformResourceType returns Terraform resource type for this AccessPolicy diff --git a/apis/conditionalaccess/v1beta1/zz_groupversion_info.go b/apis/conditionalaccess/v1beta1/zz_groupversion_info.go index eb070dd6..cf369352 100755 --- a/apis/conditionalaccess/v1beta1/zz_groupversion_info.go +++ b/apis/conditionalaccess/v1beta1/zz_groupversion_info.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/conditionalaccess/v1beta1/zz_location_types.go b/apis/conditionalaccess/v1beta1/zz_location_types.go index d9defdfd..5c56f29a 100755 --- a/apis/conditionalaccess/v1beta1/zz_location_types.go +++ b/apis/conditionalaccess/v1beta1/zz_location_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/directoryroles/v1beta1/zz_customdirectoryrole_types.go b/apis/directoryroles/v1beta1/zz_customdirectoryrole_types.go index a4542de0..e534362a 100755 --- a/apis/directoryroles/v1beta1/zz_customdirectoryrole_types.go +++ b/apis/directoryroles/v1beta1/zz_customdirectoryrole_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/directoryroles/v1beta1/zz_generated.resolvers.go b/apis/directoryroles/v1beta1/zz_generated.resolvers.go index 3c7695ab..c4b937ba 100644 --- a/apis/directoryroles/v1beta1/zz_generated.resolvers.go +++ b/apis/directoryroles/v1beta1/zz_generated.resolvers.go @@ -8,9 +8,9 @@ package v1beta1 import ( "context" reference "github.com/crossplane/crossplane-runtime/pkg/reference" + resource "github.com/crossplane/upjet/pkg/resource" errors "github.com/pkg/errors" v1beta1 "github.com/upbound/provider-azuread/apis/users/v1beta1" - resource "github.com/upbound/upjet/pkg/resource" client "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/apis/directoryroles/v1beta1/zz_generated_terraformed.go b/apis/directoryroles/v1beta1/zz_generated_terraformed.go index 0748027f..d60fa95c 100755 --- a/apis/directoryroles/v1beta1/zz_generated_terraformed.go +++ b/apis/directoryroles/v1beta1/zz_generated_terraformed.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -9,8 +13,8 @@ package v1beta1 import ( "github.com/pkg/errors" - "github.com/upbound/upjet/pkg/resource" - "github.com/upbound/upjet/pkg/resource/json" + "github.com/crossplane/upjet/pkg/resource" + "github.com/crossplane/upjet/pkg/resource/json" ) // GetTerraformResourceType returns Terraform resource type for this CustomDirectoryRole diff --git a/apis/directoryroles/v1beta1/zz_groupversion_info.go b/apis/directoryroles/v1beta1/zz_groupversion_info.go index 8b283333..2b825e95 100755 --- a/apis/directoryroles/v1beta1/zz_groupversion_info.go +++ b/apis/directoryroles/v1beta1/zz_groupversion_info.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/directoryroles/v1beta1/zz_role_types.go b/apis/directoryroles/v1beta1/zz_role_types.go index 9e81453c..12820c5a 100755 --- a/apis/directoryroles/v1beta1/zz_role_types.go +++ b/apis/directoryroles/v1beta1/zz_role_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/directoryroles/v1beta1/zz_roleassignment_types.go b/apis/directoryroles/v1beta1/zz_roleassignment_types.go index 2d0518da..e5a7ab16 100755 --- a/apis/directoryroles/v1beta1/zz_roleassignment_types.go +++ b/apis/directoryroles/v1beta1/zz_roleassignment_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -94,7 +98,7 @@ type RoleAssignmentParameters struct { // The template ID (in the case of built-in roles) or object ID (in the case of custom roles) of the directory role you want to assign. Changing this forces a new resource to be created. // The object ID of the directory role for this assignment // +crossplane:generate:reference:type=Role - // +crossplane:generate:reference:extractor=github.com/upbound/upjet/pkg/resource.ExtractParamPath("template_id",true) + // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractParamPath("template_id",true) // +kubebuilder:validation:Optional RoleID *string `json:"roleId,omitempty" tf:"role_id,omitempty"` diff --git a/apis/generate.go b/apis/generate.go index 6ae8c08f..19974747 100644 --- a/apis/generate.go +++ b/apis/generate.go @@ -19,7 +19,7 @@ Copyright 2021 Upbound Inc. //go:generate rm -rf ../examples-generated // Generate documentation from Terraform docs. -//go:generate go run github.com/upbound/upjet/cmd/scraper -n ${TERRAFORM_PROVIDER_SOURCE} -r ../.work/terraform-provider-azuread/${TERRAFORM_DOCS_PATH} -o ../config/provider-metadata.yaml --prelude-xpath "//text()[contains(., \"subcategory\")]" +//go:generate go run github.com/crossplane/upjet/cmd/scraper -n ${TERRAFORM_PROVIDER_SOURCE} -r ../.work/terraform-provider-azuread/${TERRAFORM_DOCS_PATH} -o ../config/provider-metadata.yaml --prelude-xpath "//text()[contains(., \"subcategory\")]" // Run Upjet generator //go:generate go run ../cmd/generator/main.go .. diff --git a/apis/groups/v1beta1/zz_generated_terraformed.go b/apis/groups/v1beta1/zz_generated_terraformed.go index 0759e6e7..553318b6 100755 --- a/apis/groups/v1beta1/zz_generated_terraformed.go +++ b/apis/groups/v1beta1/zz_generated_terraformed.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -9,8 +13,8 @@ package v1beta1 import ( "github.com/pkg/errors" - "github.com/upbound/upjet/pkg/resource" - "github.com/upbound/upjet/pkg/resource/json" + "github.com/crossplane/upjet/pkg/resource" + "github.com/crossplane/upjet/pkg/resource/json" ) // GetTerraformResourceType returns Terraform resource type for this Group diff --git a/apis/groups/v1beta1/zz_group_types.go b/apis/groups/v1beta1/zz_group_types.go index 44f8455b..46de0a89 100755 --- a/apis/groups/v1beta1/zz_group_types.go +++ b/apis/groups/v1beta1/zz_group_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/groups/v1beta1/zz_groupversion_info.go b/apis/groups/v1beta1/zz_groupversion_info.go index 5040d31a..ad985329 100755 --- a/apis/groups/v1beta1/zz_groupversion_info.go +++ b/apis/groups/v1beta1/zz_groupversion_info.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/groups/v1beta1/zz_member_types.go b/apis/groups/v1beta1/zz_member_types.go index 904a85b8..7c4dbdcc 100755 --- a/apis/groups/v1beta1/zz_member_types.go +++ b/apis/groups/v1beta1/zz_member_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/invitations/v1beta1/zz_generated_terraformed.go b/apis/invitations/v1beta1/zz_generated_terraformed.go index 3985069b..e7614970 100755 --- a/apis/invitations/v1beta1/zz_generated_terraformed.go +++ b/apis/invitations/v1beta1/zz_generated_terraformed.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -9,8 +13,8 @@ package v1beta1 import ( "github.com/pkg/errors" - "github.com/upbound/upjet/pkg/resource" - "github.com/upbound/upjet/pkg/resource/json" + "github.com/crossplane/upjet/pkg/resource" + "github.com/crossplane/upjet/pkg/resource/json" ) // GetTerraformResourceType returns Terraform resource type for this Invitation diff --git a/apis/invitations/v1beta1/zz_groupversion_info.go b/apis/invitations/v1beta1/zz_groupversion_info.go index 6acfe158..f01ae2af 100755 --- a/apis/invitations/v1beta1/zz_groupversion_info.go +++ b/apis/invitations/v1beta1/zz_groupversion_info.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/invitations/v1beta1/zz_invitation_types.go b/apis/invitations/v1beta1/zz_invitation_types.go index ce1c1ac8..ad0f6dab 100755 --- a/apis/invitations/v1beta1/zz_invitation_types.go +++ b/apis/invitations/v1beta1/zz_invitation_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/policies/v1beta1/zz_claimsmappingpolicy_types.go b/apis/policies/v1beta1/zz_claimsmappingpolicy_types.go index f408083f..e4251f3a 100755 --- a/apis/policies/v1beta1/zz_claimsmappingpolicy_types.go +++ b/apis/policies/v1beta1/zz_claimsmappingpolicy_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/policies/v1beta1/zz_generated_terraformed.go b/apis/policies/v1beta1/zz_generated_terraformed.go index 23ed540e..0b63ba2d 100755 --- a/apis/policies/v1beta1/zz_generated_terraformed.go +++ b/apis/policies/v1beta1/zz_generated_terraformed.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -9,8 +13,8 @@ package v1beta1 import ( "github.com/pkg/errors" - "github.com/upbound/upjet/pkg/resource" - "github.com/upbound/upjet/pkg/resource/json" + "github.com/crossplane/upjet/pkg/resource" + "github.com/crossplane/upjet/pkg/resource/json" ) // GetTerraformResourceType returns Terraform resource type for this ClaimsMappingPolicy diff --git a/apis/policies/v1beta1/zz_groupversion_info.go b/apis/policies/v1beta1/zz_groupversion_info.go index 8af66fd3..8b3dc0e3 100755 --- a/apis/policies/v1beta1/zz_groupversion_info.go +++ b/apis/policies/v1beta1/zz_groupversion_info.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/serviceprincipaldelegated/v1beta1/zz_generated.resolvers.go b/apis/serviceprincipaldelegated/v1beta1/zz_generated.resolvers.go index 630eb5fa..7e242a0f 100644 --- a/apis/serviceprincipaldelegated/v1beta1/zz_generated.resolvers.go +++ b/apis/serviceprincipaldelegated/v1beta1/zz_generated.resolvers.go @@ -8,10 +8,10 @@ package v1beta1 import ( "context" reference "github.com/crossplane/crossplane-runtime/pkg/reference" + resource "github.com/crossplane/upjet/pkg/resource" errors "github.com/pkg/errors" v1beta1 "github.com/upbound/provider-azuread/apis/serviceprincipals/v1beta1" v1beta11 "github.com/upbound/provider-azuread/apis/users/v1beta1" - resource "github.com/upbound/upjet/pkg/resource" client "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/apis/serviceprincipaldelegated/v1beta1/zz_generated_terraformed.go b/apis/serviceprincipaldelegated/v1beta1/zz_generated_terraformed.go index f4ec2ac2..51b35117 100755 --- a/apis/serviceprincipaldelegated/v1beta1/zz_generated_terraformed.go +++ b/apis/serviceprincipaldelegated/v1beta1/zz_generated_terraformed.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -9,8 +13,8 @@ package v1beta1 import ( "github.com/pkg/errors" - "github.com/upbound/upjet/pkg/resource" - "github.com/upbound/upjet/pkg/resource/json" + "github.com/crossplane/upjet/pkg/resource" + "github.com/crossplane/upjet/pkg/resource/json" ) // GetTerraformResourceType returns Terraform resource type for this PermissionGrant diff --git a/apis/serviceprincipaldelegated/v1beta1/zz_groupversion_info.go b/apis/serviceprincipaldelegated/v1beta1/zz_groupversion_info.go index 8d0968bc..1aa88a97 100755 --- a/apis/serviceprincipaldelegated/v1beta1/zz_groupversion_info.go +++ b/apis/serviceprincipaldelegated/v1beta1/zz_groupversion_info.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/serviceprincipaldelegated/v1beta1/zz_permissiongrant_types.go b/apis/serviceprincipaldelegated/v1beta1/zz_permissiongrant_types.go index c817d127..a6e6828e 100755 --- a/apis/serviceprincipaldelegated/v1beta1/zz_permissiongrant_types.go +++ b/apis/serviceprincipaldelegated/v1beta1/zz_permissiongrant_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -80,7 +84,7 @@ type PermissionGrantParameters struct { // - The object ID of the user on behalf of whom the service principal is authorized to access the resource. When omitted, the delegated permission grant will be consented for all users. Changing this forces a new resource to be created. // The object ID of the user on behalf of whom the service principal is authorized to access the resource // +crossplane:generate:reference:type=github.com/upbound/provider-azuread/apis/users/v1beta1.User - // +crossplane:generate:reference:extractor=github.com/upbound/upjet/pkg/resource.ExtractParamPath("object_id",true) + // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractParamPath("object_id",true) // +kubebuilder:validation:Optional UserObjectID *string `json:"userObjectId,omitempty" tf:"user_object_id,omitempty"` diff --git a/apis/serviceprincipals/v1beta1/zz_certificate_types.go b/apis/serviceprincipals/v1beta1/zz_certificate_types.go index 744a4800..fa3106a8 100755 --- a/apis/serviceprincipals/v1beta1/zz_certificate_types.go +++ b/apis/serviceprincipals/v1beta1/zz_certificate_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/serviceprincipals/v1beta1/zz_claimsmappingpolicyassignment_types.go b/apis/serviceprincipals/v1beta1/zz_claimsmappingpolicyassignment_types.go index cfdfe14a..db415675 100755 --- a/apis/serviceprincipals/v1beta1/zz_claimsmappingpolicyassignment_types.go +++ b/apis/serviceprincipals/v1beta1/zz_claimsmappingpolicyassignment_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/serviceprincipals/v1beta1/zz_generated.resolvers.go b/apis/serviceprincipals/v1beta1/zz_generated.resolvers.go index ebef9020..ab372f94 100644 --- a/apis/serviceprincipals/v1beta1/zz_generated.resolvers.go +++ b/apis/serviceprincipals/v1beta1/zz_generated.resolvers.go @@ -8,10 +8,10 @@ package v1beta1 import ( "context" reference "github.com/crossplane/crossplane-runtime/pkg/reference" + resource "github.com/crossplane/upjet/pkg/resource" errors "github.com/pkg/errors" v1beta11 "github.com/upbound/provider-azuread/apis/applications/v1beta1" v1beta1 "github.com/upbound/provider-azuread/apis/policies/v1beta1" - resource "github.com/upbound/upjet/pkg/resource" client "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/apis/serviceprincipals/v1beta1/zz_generated_terraformed.go b/apis/serviceprincipals/v1beta1/zz_generated_terraformed.go index af829092..61cadebd 100755 --- a/apis/serviceprincipals/v1beta1/zz_generated_terraformed.go +++ b/apis/serviceprincipals/v1beta1/zz_generated_terraformed.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -9,8 +13,8 @@ package v1beta1 import ( "github.com/pkg/errors" - "github.com/upbound/upjet/pkg/resource" - "github.com/upbound/upjet/pkg/resource/json" + "github.com/crossplane/upjet/pkg/resource" + "github.com/crossplane/upjet/pkg/resource/json" ) // GetTerraformResourceType returns Terraform resource type for this Principal diff --git a/apis/serviceprincipals/v1beta1/zz_groupversion_info.go b/apis/serviceprincipals/v1beta1/zz_groupversion_info.go index b73f820a..101ed2d0 100755 --- a/apis/serviceprincipals/v1beta1/zz_groupversion_info.go +++ b/apis/serviceprincipals/v1beta1/zz_groupversion_info.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/serviceprincipals/v1beta1/zz_password_types.go b/apis/serviceprincipals/v1beta1/zz_password_types.go index c02b1e0d..1e3a2052 100755 --- a/apis/serviceprincipals/v1beta1/zz_password_types.go +++ b/apis/serviceprincipals/v1beta1/zz_password_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/serviceprincipals/v1beta1/zz_principal_types.go b/apis/serviceprincipals/v1beta1/zz_principal_types.go index 8a7fb189..188d9bf2 100755 --- a/apis/serviceprincipals/v1beta1/zz_principal_types.go +++ b/apis/serviceprincipals/v1beta1/zz_principal_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -325,7 +329,7 @@ type PrincipalParameters struct { // The application ID (client ID) of the application for which to create a service principal. // The application ID (client ID) of the application for which to create a service principal // +crossplane:generate:reference:type=github.com/upbound/provider-azuread/apis/applications/v1beta1.Application - // +crossplane:generate:reference:extractor=github.com/upbound/upjet/pkg/resource.ExtractParamPath("application_id",true) + // +crossplane:generate:reference:extractor=github.com/crossplane/upjet/pkg/resource.ExtractParamPath("application_id",true) // +kubebuilder:validation:Optional ApplicationID *string `json:"applicationId,omitempty" tf:"application_id,omitempty"` diff --git a/apis/serviceprincipals/v1beta1/zz_tokensigningcertificate_types.go b/apis/serviceprincipals/v1beta1/zz_tokensigningcertificate_types.go index b3425463..853f25f3 100755 --- a/apis/serviceprincipals/v1beta1/zz_tokensigningcertificate_types.go +++ b/apis/serviceprincipals/v1beta1/zz_tokensigningcertificate_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/synchronization/v1beta1/zz_generated_terraformed.go b/apis/synchronization/v1beta1/zz_generated_terraformed.go index 2b285449..22f845e6 100755 --- a/apis/synchronization/v1beta1/zz_generated_terraformed.go +++ b/apis/synchronization/v1beta1/zz_generated_terraformed.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -9,8 +13,8 @@ package v1beta1 import ( "github.com/pkg/errors" - "github.com/upbound/upjet/pkg/resource" - "github.com/upbound/upjet/pkg/resource/json" + "github.com/crossplane/upjet/pkg/resource" + "github.com/crossplane/upjet/pkg/resource/json" ) // GetTerraformResourceType returns Terraform resource type for this Job diff --git a/apis/synchronization/v1beta1/zz_groupversion_info.go b/apis/synchronization/v1beta1/zz_groupversion_info.go index 4b7280af..4ac820fa 100755 --- a/apis/synchronization/v1beta1/zz_groupversion_info.go +++ b/apis/synchronization/v1beta1/zz_groupversion_info.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/synchronization/v1beta1/zz_job_types.go b/apis/synchronization/v1beta1/zz_job_types.go index 5fc28c54..cdbd6b48 100755 --- a/apis/synchronization/v1beta1/zz_job_types.go +++ b/apis/synchronization/v1beta1/zz_job_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/synchronization/v1beta1/zz_secret_types.go b/apis/synchronization/v1beta1/zz_secret_types.go index 04ca9a4b..073e0a4f 100755 --- a/apis/synchronization/v1beta1/zz_secret_types.go +++ b/apis/synchronization/v1beta1/zz_secret_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/users/v1beta1/zz_generated_terraformed.go b/apis/users/v1beta1/zz_generated_terraformed.go index b3d22366..de25b093 100755 --- a/apis/users/v1beta1/zz_generated_terraformed.go +++ b/apis/users/v1beta1/zz_generated_terraformed.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -9,8 +13,8 @@ package v1beta1 import ( "github.com/pkg/errors" - "github.com/upbound/upjet/pkg/resource" - "github.com/upbound/upjet/pkg/resource/json" + "github.com/crossplane/upjet/pkg/resource" + "github.com/crossplane/upjet/pkg/resource/json" ) // GetTerraformResourceType returns Terraform resource type for this User diff --git a/apis/users/v1beta1/zz_groupversion_info.go b/apis/users/v1beta1/zz_groupversion_info.go index f1b08833..30fe5161 100755 --- a/apis/users/v1beta1/zz_groupversion_info.go +++ b/apis/users/v1beta1/zz_groupversion_info.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/users/v1beta1/zz_user_types.go b/apis/users/v1beta1/zz_user_types.go index 1c77be76..990938ab 100755 --- a/apis/users/v1beta1/zz_user_types.go +++ b/apis/users/v1beta1/zz_user_types.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/apis/zz_register.go b/apis/zz_register.go index 0affa7a7..31594031 100755 --- a/apis/zz_register.go +++ b/apis/zz_register.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ diff --git a/cmd/generator/main.go b/cmd/generator/main.go index a1587f8a..2f8141fd 100644 --- a/cmd/generator/main.go +++ b/cmd/generator/main.go @@ -22,8 +22,8 @@ import ( "sort" "strings" - ujconfig "github.com/upbound/upjet/pkg/config" - "github.com/upbound/upjet/pkg/pipeline" + ujconfig "github.com/crossplane/upjet/pkg/config" + "github.com/crossplane/upjet/pkg/pipeline" "gopkg.in/alecthomas/kingpin.v2" "github.com/upbound/provider-azuread/config" diff --git a/cmd/provider/main.go b/cmd/provider/main.go index ce31be9b..ed711558 100644 --- a/cmd/provider/main.go +++ b/cmd/provider/main.go @@ -28,8 +28,8 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/logging" "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/terraform" "gopkg.in/alecthomas/kingpin.v2" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/config/administrativeunits/config.go b/config/administrativeunits/config.go index 8119ba6c..c9c58a90 100644 --- a/config/administrativeunits/config.go +++ b/config/administrativeunits/config.go @@ -1,6 +1,6 @@ package administrativeunits -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" const group = "administrativeunits" diff --git a/config/app/config.go b/config/app/config.go index da423ba3..1b2b9817 100644 --- a/config/app/config.go +++ b/config/app/config.go @@ -1,6 +1,6 @@ package app -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" // Configure configures individual resources by adding custom ResourceConfigurators. func Configure(p *config.Provider) { diff --git a/config/applications/config.go b/config/applications/config.go index a89144ac..1490285f 100644 --- a/config/applications/config.go +++ b/config/applications/config.go @@ -1,6 +1,6 @@ package applications -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" const group = "applications" @@ -47,7 +47,7 @@ func Configure(p *config.Provider) { } r.References["authorized_app_id"] = config.Reference{ Type: "Application", - Extractor: `github.com/upbound/upjet/pkg/resource.ExtractParamPath("application_id",true)`, + Extractor: `github.com/crossplane/upjet/pkg/resource.ExtractParamPath("application_id",true)`, } // We need to override the default group that upjet generated for // this resource, which would be "azuread" diff --git a/config/conditionalaccess/config.go b/config/conditionalaccess/config.go index cfaf6363..0f9cc1a0 100644 --- a/config/conditionalaccess/config.go +++ b/config/conditionalaccess/config.go @@ -1,6 +1,6 @@ package conditionalaccess -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" const group = "conditionalaccess" diff --git a/config/directoryroles/config.go b/config/directoryroles/config.go index f3043b3e..5e75e70a 100644 --- a/config/directoryroles/config.go +++ b/config/directoryroles/config.go @@ -1,6 +1,6 @@ package directoryroles -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" const group = "directoryroles" @@ -22,7 +22,7 @@ func Configure(p *config.Provider) { p.AddResourceConfigurator("azuread_directory_role_assignment", func(r *config.Resource) { r.References["role_id"] = config.Reference{ Type: "Role", - Extractor: `github.com/upbound/upjet/pkg/resource.ExtractParamPath("template_id",true)`, + Extractor: `github.com/crossplane/upjet/pkg/resource.ExtractParamPath("template_id",true)`, } r.References["principal_object_id"] = config.Reference{ Type: "github.com/upbound/provider-azuread/apis/users/v1beta1.User", diff --git a/config/external_name.go b/config/external_name.go index 8178a9b0..7c9bd367 100644 --- a/config/external_name.go +++ b/config/external_name.go @@ -4,7 +4,7 @@ Copyright 2022 Upbound Inc. package config -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" // ExternalNameConfigs contains all external name configurations for this // provider. diff --git a/config/groups/config.go b/config/groups/config.go index a003d8bf..21927bba 100644 --- a/config/groups/config.go +++ b/config/groups/config.go @@ -1,6 +1,6 @@ package groups -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" // Configure configures individual resources by adding custom ResourceConfigurators. func Configure(p *config.Provider) { diff --git a/config/invitations/config.go b/config/invitations/config.go index 0aa6896b..420ab00e 100644 --- a/config/invitations/config.go +++ b/config/invitations/config.go @@ -1,6 +1,6 @@ package invitations -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" // Configure configures individual resources by adding custom ResourceConfigurators. func Configure(p *config.Provider) { diff --git a/config/policies/config.go b/config/policies/config.go index 2c651225..2c035c0e 100644 --- a/config/policies/config.go +++ b/config/policies/config.go @@ -1,6 +1,6 @@ package policies -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" // Configure configures individual resources by adding custom ResourceConfigurators. func Configure(p *config.Provider) { diff --git a/config/provider.go b/config/provider.go index 8037952f..6f3c8671 100644 --- a/config/provider.go +++ b/config/provider.go @@ -8,8 +8,8 @@ import ( // Note(turkenh): we are importing this to embed provider schema document _ "embed" - ujconfig "github.com/upbound/upjet/pkg/config" - "github.com/upbound/upjet/pkg/registry/reference" + ujconfig "github.com/crossplane/upjet/pkg/config" + "github.com/crossplane/upjet/pkg/registry/reference" "github.com/upbound/provider-azuread/config/administrativeunits" "github.com/upbound/provider-azuread/config/app" diff --git a/config/serviceprincipaldelegated/config.go b/config/serviceprincipaldelegated/config.go index d12ad2be..08ad5c14 100644 --- a/config/serviceprincipaldelegated/config.go +++ b/config/serviceprincipaldelegated/config.go @@ -1,6 +1,6 @@ package serviceprincipaldelegated -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" // Configure configures individual resources by adding custom ResourceConfigurators. func Configure(p *config.Provider) { diff --git a/config/serviceprincipals/config.go b/config/serviceprincipals/config.go index 53bcaba5..2e9c4ce6 100644 --- a/config/serviceprincipals/config.go +++ b/config/serviceprincipals/config.go @@ -1,6 +1,6 @@ package serviceprincipals -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" const group = "serviceprincipals" @@ -9,7 +9,7 @@ func Configure(p *config.Provider) { p.AddResourceConfigurator("azuread_service_principal", func(r *config.Resource) { r.References["application_id"] = config.Reference{ Type: "github.com/upbound/provider-azuread/apis/applications/v1beta1.Application", - Extractor: `github.com/upbound/upjet/pkg/resource.ExtractParamPath("application_id",true)`, + Extractor: `github.com/crossplane/upjet/pkg/resource.ExtractParamPath("application_id",true)`, } // We need to override the default group that upjet generated for // this resource, which would be "azuread" diff --git a/config/synchronization/config.go b/config/synchronization/config.go index 93954660..9326d84a 100644 --- a/config/synchronization/config.go +++ b/config/synchronization/config.go @@ -1,6 +1,6 @@ package synchronization -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" const group = "synchronization" diff --git a/config/users/config.go b/config/users/config.go index 65936130..495b75ad 100644 --- a/config/users/config.go +++ b/config/users/config.go @@ -1,6 +1,6 @@ package users -import "github.com/upbound/upjet/pkg/config" +import "github.com/crossplane/upjet/pkg/config" // Configure configures individual resources by adding custom ResourceConfigurators. func Configure(p *config.Provider) { diff --git a/go.mod b/go.mod index 24caca0e..2cadb1fa 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.19 require ( github.com/crossplane/crossplane-runtime v1.14.0-rc.0.0.20230912122805-43c9ceeb2071 github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 + github.com/crossplane/upjet v0.11.0-rc.0.0.20231011093342-b54f63590aa6 github.com/pkg/errors v0.9.1 - github.com/upbound/upjet v0.11.0-rc.0.0.20230927185952-cc55f3952474 gopkg.in/alecthomas/kingpin.v2 v2.2.6 k8s.io/apimachinery v0.28.3 k8s.io/client-go v0.28.3 diff --git a/go.sum b/go.sum index 5b3a8e63..abaf0d22 100644 --- a/go.sum +++ b/go.sum @@ -78,6 +78,8 @@ github.com/crossplane/crossplane-runtime v1.14.0-rc.0.0.20230912122805-43c9ceeb2 github.com/crossplane/crossplane-runtime v1.14.0-rc.0.0.20230912122805-43c9ceeb2071/go.mod h1:R80Kb/MddGNqL1A6khYup2d1eljmd9sFkcZkw1jVHME= github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 h1:HigXs5tEQxWz0fcj8hzbU2UAZgEM7wPe0XRFOsrtF8Y= github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79/go.mod h1:+e4OaFlOcmr0JvINHl/yvEYBrZawzTgj6pQumOH1SS0= +github.com/crossplane/upjet v0.11.0-rc.0.0.20231011093342-b54f63590aa6 h1:3k7SEGdK7RqS5ZhDQZjHeouGUARHFY9+dS3gS0ODp10= +github.com/crossplane/upjet v0.11.0-rc.0.0.20231011093342-b54f63590aa6/go.mod h1:U4UCrzh7lHm8vc13tGJfrUS7jiPPAP0VRcbuU4bIkBU= github.com/dave/jennifer v1.4.1 h1:XyqG6cn5RQsTj3qlWQTKlRGAyrTcsk1kUmWdZBzRjDw= github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpTVGlwA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -337,8 +339,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/tmccombs/hcl2json v0.3.3 h1:+DLNYqpWE0CsOQiEZu+OZm5ZBImake3wtITYxQ8uLFQ= github.com/tmccombs/hcl2json v0.3.3/go.mod h1:Y2chtz2x9bAeRTvSibVRVgbLJhLJXKlUeIvjeVdnm4w= -github.com/upbound/upjet v0.11.0-rc.0.0.20230927185952-cc55f3952474 h1:/fO/9nZUalXmFn1xWH+ky87Yxymyv4J6xWun51Lgde0= -github.com/upbound/upjet v0.11.0-rc.0.0.20230927185952-cc55f3952474/go.mod h1:2RXHgpIugCL/S/Use1QJAeVaev901RBeUByQh5gUtGk= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= diff --git a/internal/clients/azuread.go b/internal/clients/azuread.go index b7bc2ea4..874159c1 100644 --- a/internal/clients/azuread.go +++ b/internal/clients/azuread.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/upbound/upjet/pkg/terraform" + "github.com/crossplane/upjet/pkg/terraform" "github.com/upbound/provider-azuread/apis/v1beta1" ) diff --git a/internal/controller/administrativeunits/member/zz_controller.go b/internal/controller/administrativeunits/member/zz_controller.go index 67fef15a..d7224287 100755 --- a/internal/controller/administrativeunits/member/zz_controller.go +++ b/internal/controller/administrativeunits/member/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/administrativeunits/v1beta1" diff --git a/internal/controller/administrativeunits/unit/zz_controller.go b/internal/controller/administrativeunits/unit/zz_controller.go index b6b55b12..79c8b11c 100755 --- a/internal/controller/administrativeunits/unit/zz_controller.go +++ b/internal/controller/administrativeunits/unit/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/administrativeunits/v1beta1" diff --git a/internal/controller/app/roleassignment/zz_controller.go b/internal/controller/app/roleassignment/zz_controller.go index 362c191f..c2fb4697 100755 --- a/internal/controller/app/roleassignment/zz_controller.go +++ b/internal/controller/app/roleassignment/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/app/v1beta1" diff --git a/internal/controller/applications/application/zz_controller.go b/internal/controller/applications/application/zz_controller.go index 0945604d..d5427a43 100755 --- a/internal/controller/applications/application/zz_controller.go +++ b/internal/controller/applications/application/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/applications/v1beta1" diff --git a/internal/controller/applications/certificate/zz_controller.go b/internal/controller/applications/certificate/zz_controller.go index e9834631..70740f6f 100755 --- a/internal/controller/applications/certificate/zz_controller.go +++ b/internal/controller/applications/certificate/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/applications/v1beta1" diff --git a/internal/controller/applications/federatedidentitycredential/zz_controller.go b/internal/controller/applications/federatedidentitycredential/zz_controller.go index a4575ec3..5cd9365c 100755 --- a/internal/controller/applications/federatedidentitycredential/zz_controller.go +++ b/internal/controller/applications/federatedidentitycredential/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/applications/v1beta1" diff --git a/internal/controller/applications/password/zz_controller.go b/internal/controller/applications/password/zz_controller.go index 56549f9d..86d3f857 100755 --- a/internal/controller/applications/password/zz_controller.go +++ b/internal/controller/applications/password/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/applications/v1beta1" diff --git a/internal/controller/applications/preauthorized/zz_controller.go b/internal/controller/applications/preauthorized/zz_controller.go index 9d47ff03..9a705464 100755 --- a/internal/controller/applications/preauthorized/zz_controller.go +++ b/internal/controller/applications/preauthorized/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/applications/v1beta1" diff --git a/internal/controller/conditionalaccess/accesspolicy/zz_controller.go b/internal/controller/conditionalaccess/accesspolicy/zz_controller.go index 0b6a6f1b..cdd6abdc 100755 --- a/internal/controller/conditionalaccess/accesspolicy/zz_controller.go +++ b/internal/controller/conditionalaccess/accesspolicy/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/conditionalaccess/v1beta1" diff --git a/internal/controller/conditionalaccess/location/zz_controller.go b/internal/controller/conditionalaccess/location/zz_controller.go index 56645b0c..d394290f 100755 --- a/internal/controller/conditionalaccess/location/zz_controller.go +++ b/internal/controller/conditionalaccess/location/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/conditionalaccess/v1beta1" diff --git a/internal/controller/directoryroles/customdirectoryrole/zz_controller.go b/internal/controller/directoryroles/customdirectoryrole/zz_controller.go index 60a0dba6..5e1d177d 100755 --- a/internal/controller/directoryroles/customdirectoryrole/zz_controller.go +++ b/internal/controller/directoryroles/customdirectoryrole/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/directoryroles/v1beta1" diff --git a/internal/controller/directoryroles/role/zz_controller.go b/internal/controller/directoryroles/role/zz_controller.go index 4ffe9d67..04874619 100755 --- a/internal/controller/directoryroles/role/zz_controller.go +++ b/internal/controller/directoryroles/role/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/directoryroles/v1beta1" diff --git a/internal/controller/directoryroles/roleassignment/zz_controller.go b/internal/controller/directoryroles/roleassignment/zz_controller.go index 3b25c896..9cb38540 100755 --- a/internal/controller/directoryroles/roleassignment/zz_controller.go +++ b/internal/controller/directoryroles/roleassignment/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/directoryroles/v1beta1" diff --git a/internal/controller/groups/group/zz_controller.go b/internal/controller/groups/group/zz_controller.go index 91b6730a..d3681bda 100755 --- a/internal/controller/groups/group/zz_controller.go +++ b/internal/controller/groups/group/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/groups/v1beta1" diff --git a/internal/controller/groups/member/zz_controller.go b/internal/controller/groups/member/zz_controller.go index 600de3da..fdcd73ef 100755 --- a/internal/controller/groups/member/zz_controller.go +++ b/internal/controller/groups/member/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/groups/v1beta1" diff --git a/internal/controller/invitations/invitation/zz_controller.go b/internal/controller/invitations/invitation/zz_controller.go index b0d0f22b..90137fa1 100755 --- a/internal/controller/invitations/invitation/zz_controller.go +++ b/internal/controller/invitations/invitation/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/invitations/v1beta1" diff --git a/internal/controller/policies/claimsmappingpolicy/zz_controller.go b/internal/controller/policies/claimsmappingpolicy/zz_controller.go index 9ed967cf..f4121b06 100755 --- a/internal/controller/policies/claimsmappingpolicy/zz_controller.go +++ b/internal/controller/policies/claimsmappingpolicy/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/policies/v1beta1" diff --git a/internal/controller/providerconfig/config.go b/internal/controller/providerconfig/config.go index a12bd676..b893bf59 100644 --- a/internal/controller/providerconfig/config.go +++ b/internal/controller/providerconfig/config.go @@ -8,7 +8,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/event" "github.com/crossplane/crossplane-runtime/pkg/reconciler/providerconfig" "github.com/crossplane/crossplane-runtime/pkg/resource" - "github.com/upbound/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller" ctrl "sigs.k8s.io/controller-runtime" "github.com/upbound/provider-azuread/apis/v1beta1" diff --git a/internal/controller/serviceprincipaldelegated/permissiongrant/zz_controller.go b/internal/controller/serviceprincipaldelegated/permissiongrant/zz_controller.go index 149ac367..30a8ec73 100755 --- a/internal/controller/serviceprincipaldelegated/permissiongrant/zz_controller.go +++ b/internal/controller/serviceprincipaldelegated/permissiongrant/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/serviceprincipaldelegated/v1beta1" diff --git a/internal/controller/serviceprincipals/certificate/zz_controller.go b/internal/controller/serviceprincipals/certificate/zz_controller.go index 57291f20..fc6f6d0a 100755 --- a/internal/controller/serviceprincipals/certificate/zz_controller.go +++ b/internal/controller/serviceprincipals/certificate/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/serviceprincipals/v1beta1" diff --git a/internal/controller/serviceprincipals/claimsmappingpolicyassignment/zz_controller.go b/internal/controller/serviceprincipals/claimsmappingpolicyassignment/zz_controller.go index f2987f28..20c12202 100755 --- a/internal/controller/serviceprincipals/claimsmappingpolicyassignment/zz_controller.go +++ b/internal/controller/serviceprincipals/claimsmappingpolicyassignment/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/serviceprincipals/v1beta1" diff --git a/internal/controller/serviceprincipals/password/zz_controller.go b/internal/controller/serviceprincipals/password/zz_controller.go index 4759510c..6fa6abb4 100755 --- a/internal/controller/serviceprincipals/password/zz_controller.go +++ b/internal/controller/serviceprincipals/password/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/serviceprincipals/v1beta1" diff --git a/internal/controller/serviceprincipals/principal/zz_controller.go b/internal/controller/serviceprincipals/principal/zz_controller.go index aedee75a..fc4b25f0 100755 --- a/internal/controller/serviceprincipals/principal/zz_controller.go +++ b/internal/controller/serviceprincipals/principal/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/serviceprincipals/v1beta1" diff --git a/internal/controller/serviceprincipals/tokensigningcertificate/zz_controller.go b/internal/controller/serviceprincipals/tokensigningcertificate/zz_controller.go index 1df6eb10..08c940f2 100755 --- a/internal/controller/serviceprincipals/tokensigningcertificate/zz_controller.go +++ b/internal/controller/serviceprincipals/tokensigningcertificate/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/serviceprincipals/v1beta1" diff --git a/internal/controller/synchronization/job/zz_controller.go b/internal/controller/synchronization/job/zz_controller.go index 458fb008..48bf14b8 100755 --- a/internal/controller/synchronization/job/zz_controller.go +++ b/internal/controller/synchronization/job/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/synchronization/v1beta1" diff --git a/internal/controller/synchronization/secret/zz_controller.go b/internal/controller/synchronization/secret/zz_controller.go index 066146a0..eaa7f1f7 100755 --- a/internal/controller/synchronization/secret/zz_controller.go +++ b/internal/controller/synchronization/secret/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/synchronization/v1beta1" diff --git a/internal/controller/users/user/zz_controller.go b/internal/controller/users/user/zz_controller.go index 6c1a7326..09c53683 100755 --- a/internal/controller/users/user/zz_controller.go +++ b/internal/controller/users/user/zz_controller.go @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 + /* Copyright 2022 Upbound Inc. */ @@ -14,9 +18,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" - tjcontroller "github.com/upbound/upjet/pkg/controller" - "github.com/upbound/upjet/pkg/controller/handler" - "github.com/upbound/upjet/pkg/terraform" + tjcontroller "github.com/crossplane/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller/handler" + "github.com/crossplane/upjet/pkg/terraform" ctrl "sigs.k8s.io/controller-runtime" v1beta1 "github.com/upbound/provider-azuread/apis/users/v1beta1" diff --git a/internal/controller/zz_setup.go b/internal/controller/zz_setup.go index a212c809..35323c1a 100755 --- a/internal/controller/zz_setup.go +++ b/internal/controller/zz_setup.go @@ -1,13 +1,13 @@ -/* -Copyright 2021 Upbound Inc. -*/ +// SPDX-FileCopyrightText: 2023 The Crossplane Authors +// +// SPDX-License-Identifier: Apache-2.0 package controller import ( ctrl "sigs.k8s.io/controller-runtime" - "github.com/upbound/upjet/pkg/controller" + "github.com/crossplane/upjet/pkg/controller" member "github.com/upbound/provider-azuread/internal/controller/administrativeunits/member" unit "github.com/upbound/provider-azuread/internal/controller/administrativeunits/unit"