From d3ff233f11193f74e44b8e2d4c49c6031edad970 Mon Sep 17 00:00:00 2001 From: aksel-skaar-leirvaag Date: Tue, 27 Feb 2024 18:17:56 +0100 Subject: [PATCH] rename github.com/weaveworks/tf-controller to github.com/flux-iac/tofu-controller --- DEVELOPMENT.md | 2 +- Dockerfile | 2 +- PROJECT | 6 +++--- SECURITY.md | 2 +- api/go.mod | 2 +- api/v1alpha2/terraform_types.go | 2 +- cmd/branch-planner/flags.go | 2 +- cmd/branch-planner/informer.go | 8 ++++---- cmd/branch-planner/main.go | 2 +- cmd/branch-planner/polling.go | 2 +- cmd/manager/main.go | 8 ++++---- cmd/runner/main.go | 2 +- cmd/tfctl/main.go | 2 +- controllers/cleaner_test.go | 4 ++-- controllers/get_runner_pod_object_key_test.go | 5 +++-- controllers/object_encode_test.go | 5 +++-- controllers/suite_test.go | 6 +++--- controllers/tc000010_no_outputs_test.go | 2 +- controllers/tc000011_bad_tar_gz_no_outputs_test.go | 2 +- controllers/tc000011_workspace_no_outputs_test.go | 2 +- controllers/tc000012_src_bucket_no_outputs_test.go | 2 +- controllers/tc000013_source_not_found_test.go | 2 +- controllers/tc000014_artifact_not_found_test.go | 2 +- ...c000015_cliconfigsecret_cross_ns_denied_test.go | 2 +- .../tc000015_depends_on_cross_ns_denied_test.go | 2 +- .../tc000015_source_cross_ns_denied_test.go | 2 +- .../tc000016_default_observed_generation_test.go | 2 +- controllers/tc000016_finilize_status_test.go | 2 +- .../tc000020_with_backend_no_outputs_test.go | 2 +- .../tc000020_with_workspace_no_outputs_test.go | 2 +- controllers/tc000030_plan_only_no_outputs_test.go | 2 +- ...lan_only_with_showplan_as_cm_no_outputs_test.go | 2 +- controllers/tc000040_controlled_outputs_test.go | 2 +- controllers/tc000041_all_outputs_test.go | 2 +- .../tc000042_output_name_contains_dot_test.go | 5 +++-- ...controlled_outputs_should_be_reconciled_test.go | 5 +++-- controllers/tc000044_plan_only_mode_test.go | 2 +- ...0050_plan_and_manual_approve_no_outputs_test.go | 2 +- ...nd_manual_approve_and_replan_no_outputs_test.go | 2 +- ...0052_plan_and_manual_approve_with_files_test.go | 4 ++-- .../tc000060_vars_and_controlled_outputs_test.go | 2 +- controllers/tc000061_vars_hcl_input_test.go | 2 +- controllers/tc000062_vars_hcl_test.go | 4 ++-- controllers/tc000063_values_hcl_test.go | 2 +- controllers/tc000064_values_template_hcl_test.go | 2 +- ..._varsfrom_secret_and_controlled_outputs_test.go | 2 +- ...ret_with_varkeys_and_controlled_outputs_test.go | 2 +- ...from_optional_secret_controlled_outputs_test.go | 2 +- ...3_varsfrom_accepts_many_secrets_outputs_test.go | 2 +- ...crets_with_last_supplied_key_precedence_test.go | 4 ++-- ...h_varkeys_rename_and_controlled_outputs_test.go | 2 +- ...rsfrom_configmap_and_controlled_outputs_test.go | 2 +- ...cepts_many_configmap_controlled_outputs_test.go | 2 +- ...gmaps_with_last_supplied_key_precedence_test.go | 4 ++-- ...arsfrom_override_and_controlled_outputs_test.go | 2 +- ...d_should_tx_to_plan_when_source_changed_test.go | 2 +- ..._to_plan_then_apply_when_source_changed_test.go | 2 +- .../tc000111_with_backend_s3_no_outputs_test.go | 2 +- controllers/tc000120_delete_test.go | 2 +- controllers/tc000121_destroy_on_delete_test.go | 4 ++-- controllers/tc000130_destroy_no_outputs_test.go | 4 ++-- controllers/tc000131_destroy_no_changes_test.go | 4 ++-- ..._to_plan_then_apply_when_drift_detected_test.go | 4 ++-- ...uld_report_and_loop_when_drift_detected_test.go | 4 ++-- ...x_to_plan_when_unrelated_source_changed_test.go | 4 ++-- ...e_should_delete_the_plan_and_start_over_test.go | 4 ++-- controllers/tc000180_should_detect_drift_test.go | 2 +- ...c000190_unsupported_source_should_error_test.go | 2 +- .../tc000191_missing_source_should_error_test.go | 2 +- .../tc000200_disable_drift_detection_test.go | 2 +- ...o_approve_with_disabled_drift_detection_test.go | 2 +- controllers/tc000210_plan_encode_decode_test.go | 3 ++- ...tc000220_support_config_file_via_secret_test.go | 2 +- .../tc000230_drift_detection_only_mode_test.go | 4 ++-- ...c000241_auto_approve_with_health_checks_test.go | 2 +- controllers/tc000242_bad_health_checks_test.go | 2 +- controllers/tc000243_remediation_retry_test.go | 2 +- controllers/tc000260_runner_pod_test.go | 2 +- controllers/tc000280_inventory_test.go | 4 ++-- controllers/tc000290_force_unlock_test.go | 4 ++-- controllers/tc000300_targets_test.go | 4 ++-- ...0310_node_selector_affinity_tolerations_test.go | 2 +- controllers/tc000311_init_container_test.go | 2 +- controllers/tc000320_vol_and_vol_mounts_test.go | 2 +- .../tc000330_file_mapping_no_outputs_test.go | 2 +- .../tc000340_webhooks_for_post_planning_test.go | 4 ++-- controllers/tc000350_depends_on_test.go | 2 +- controllers/tc000360_tfvars_files_test.go | 2 +- controllers/tc009990_mtls_generate_creds_test.go | 4 ++-- controllers/tf_controller.go | 4 ++-- controllers/tf_controller_apply.go | 4 ++-- controllers/tf_controller_backend.go | 4 ++-- controllers/tf_controller_drift_detect.go | 4 ++-- controllers/tf_controller_filemapping.go | 4 ++-- controllers/tf_controller_finalizer.go | 4 ++-- controllers/tf_controller_health_checks.go | 4 ++-- controllers/tf_controller_outputs.go | 6 +++--- controllers/tf_controller_plan.go | 6 +++--- controllers/tf_controller_reconcile.go | 4 ++-- controllers/tf_controller_runner.go | 6 +++--- controllers/tf_controller_webhooks.go | 4 ++-- docs/getting_started.md | 8 ++++---- docs/tfctl.md | 2 +- .../build-and-use-a-custom-runner-image.md | 2 +- docs/use-tf-controller/flux-receiver-and-alert.md | 2 +- ...vision-resources-with-customized-runner-pods.md | 2 +- docs/use-tf-controller/with-azure.md | 2 +- go.mod | 10 +++++----- internal/config/config_test.go | 2 +- internal/config/naming_test.go | 2 +- internal/git/provider/provider_test.go | 8 ++++---- .../git/provider/providerfakes/fake_provider.go | 2 +- internal/informer/branch-planner/informer.go | 6 +++--- internal/informer/branch-planner/informer_test.go | 6 +++--- internal/informer/branch-planner/main_test.go | 2 +- internal/informer/branch-planner/options.go | 2 +- internal/server/polling/config.go | 2 +- internal/server/polling/fake_git_provider_test.go | 2 +- internal/server/polling/main_test.go | 2 +- internal/server/polling/option.go | 4 ++-- internal/server/polling/poll_test.go | 14 +++++++------- internal/server/polling/server.go | 6 +++--- internal/server/polling/server_test.go | 10 +++++----- internal/server/polling/terraform.go | 6 +++--- mkdocs.yml | 2 +- mtls/grpc.go | 5 +++-- mtls/rotator.go | 2 +- mtls/runner_serve.go | 4 ++-- planner.Dockerfile | 2 +- rfcs/README.md | 2 +- runner-base.Dockerfile | 2 +- runner/read_inputs_test.go | 7 ++++--- runner/server.go | 4 ++-- runner/server_generate_tf_vars.go | 10 +++++----- runner/server_load_tfplan.go | 7 ++++--- runner/server_load_tfplan_test.go | 4 ++-- runner/server_outputs.go | 2 +- runner/server_save_tfplan.go | 8 ++++---- runner/server_workspace_blob.go | 2 +- runner/server_workspace_blob_test.go | 2 +- runner/suite_test.go | 6 +++--- tfctl/approve_plan.go | 2 +- tfctl/break_glass.go | 2 +- tfctl/create.go | 2 +- tfctl/delete_terraform.go | 2 +- tfctl/forceUnlock.go | 2 +- tfctl/get.go | 2 +- tfctl/get_terraform.go | 2 +- tfctl/go.mod | 6 +++--- tfctl/main.go | 2 +- tfctl/reconcile.go | 2 +- tfctl/replan.go | 7 ++++--- tfctl/resume.go | 2 +- tfctl/show_plan.go | 2 +- tfctl/show_plan_test.go | 2 +- tfctl/suspend.go | 2 +- 156 files changed, 262 insertions(+), 253 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 3722786a4..73586e86b 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -150,7 +150,7 @@ Running the above will also deploy `source-controller` and its CRDs to the clust For realtime communications we use Slack: To join the conversation, simply join the [Weave Users](https://weave-community.slack.com/) Slack workspace and use the [#tf-controller](https://weave-community.slack.com/messages/tf-controller/) channel. -To discuss ideas and specifications we use [Github Discussions](https://github.com/weaveworks/tf-controller/discussions). +To discuss ideas and specifications we use [Github Discussions](https://github.com/flux-iac/tofu-controller/discussions). ## Acceptance policy diff --git a/Dockerfile b/Dockerfile index 160264723..e31f273f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \ FROM alpine:3.18 -LABEL org.opencontainers.image.source="https://github.com/weaveworks/tf-controller" +LABEL org.opencontainers.image.source="https://github.com/flux-iac/tofu-controller" ARG LIBCRYPTO_VERSION diff --git a/PROJECT b/PROJECT index f0d0055e4..30e8832bc 100644 --- a/PROJECT +++ b/PROJECT @@ -2,7 +2,7 @@ domain: contrib.fluxcd.io layout: - go.kubebuilder.io/v3 projectName: test-terraform-controller -repo: github.com/weaveworks/tf-controller +repo: github.com/flux-iac/tofu-controller resources: - api: crdVersion: v1 @@ -11,7 +11,7 @@ resources: domain: contrib.fluxcd.io group: infra kind: Terraform - path: github.com/weaveworks/tf-controller/api/v1alpha1 + path: github.com/flux-iac/tofu-controller/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -20,6 +20,6 @@ resources: domain: contrib.fluxcd.io group: infra kind: Terraform - path: github.com/weaveworks/tf-controller/api/v1alpha2 + path: github.com/flux-iac/tofu-controller/api/v1alpha2 version: v1alpha2 version: "3" diff --git a/SECURITY.md b/SECURITY.md index eb0fa42f2..beeaffc5b 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -28,7 +28,7 @@ Our Security Team consists of project maintainers and Weaveworks employees. ### Disclosures -Vulnerability disclosures are announced publicly through our [security advisories](https://github.com/weaveworks/tf-controller/security/advisories). +Vulnerability disclosures are announced publicly through our [security advisories](https://github.com/flux-iac/tofu-controller/security/advisories). Disclosures will contain an overview, details about the vulnerability, a fix that will typically be an update, and optionally a workaround if one is available. We will coordinate publishing disclosures and security releases in a way that is realistic and necessary for end users. diff --git a/api/go.mod b/api/go.mod index 46862f5c4..3b6e46569 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,4 +1,4 @@ -module github.com/weaveworks/tf-controller/api +module github.com/flux-iac/tofu-controller/api go 1.19 diff --git a/api/v1alpha2/terraform_types.go b/api/v1alpha2/terraform_types.go index 56db60a05..9998bda2b 100644 --- a/api/v1alpha2/terraform_types.go +++ b/api/v1alpha2/terraform_types.go @@ -24,9 +24,9 @@ import ( "time" "unicode/utf8" + "github.com/flux-iac/tofu-controller/api/planid" "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/weaveworks/tf-controller/api/planid" corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apimeta "k8s.io/apimachinery/pkg/api/meta" diff --git a/cmd/branch-planner/flags.go b/cmd/branch-planner/flags.go index af2d6503c..5185014ca 100644 --- a/cmd/branch-planner/flags.go +++ b/cmd/branch-planner/flags.go @@ -8,7 +8,7 @@ import ( "github.com/fluxcd/pkg/runtime/logger" flag "github.com/spf13/pflag" - "github.com/weaveworks/tf-controller/internal/server/polling" + "github.com/flux-iac/tofu-controller/internal/server/polling" ) type applicationOptions struct { diff --git a/cmd/branch-planner/informer.go b/cmd/branch-planner/informer.go index 850cfc65d..c2f2ebc13 100644 --- a/cmd/branch-planner/informer.go +++ b/cmd/branch-planner/informer.go @@ -5,11 +5,11 @@ import ( "fmt" "time" + tfv1alpha2 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/internal/config" + "github.com/flux-iac/tofu-controller/internal/git/provider" + planner "github.com/flux-iac/tofu-controller/internal/informer/branch-planner" "github.com/go-logr/logr" - tfv1alpha2 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/internal/config" - "github.com/weaveworks/tf-controller/internal/git/provider" - planner "github.com/weaveworks/tf-controller/internal/informer/branch-planner" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/dynamic" diff --git a/cmd/branch-planner/main.go b/cmd/branch-planner/main.go index a45b98315..55e1d6727 100644 --- a/cmd/branch-planner/main.go +++ b/cmd/branch-planner/main.go @@ -5,11 +5,11 @@ import ( "os" "os/signal" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/fluxcd/pkg/runtime/logger" sourcev1 "github.com/fluxcd/source-controller/api/v1" sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/go-logr/logr" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" cgoscheme "k8s.io/client-go/kubernetes/scheme" diff --git a/cmd/branch-planner/polling.go b/cmd/branch-planner/polling.go index bd9646757..d6d8fa5b8 100644 --- a/cmd/branch-planner/polling.go +++ b/cmd/branch-planner/polling.go @@ -4,8 +4,8 @@ import ( "context" "fmt" + "github.com/flux-iac/tofu-controller/internal/server/polling" "github.com/go-logr/logr" - "github.com/weaveworks/tf-controller/internal/server/polling" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 117a90b70..2e29716cc 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -20,9 +20,11 @@ import ( "os" "time" - "github.com/weaveworks/tf-controller/mtls" - "github.com/weaveworks/tf-controller/runner" + "github.com/flux-iac/tofu-controller/mtls" + "github.com/flux-iac/tofu-controller/runner" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/controllers" "github.com/fluxcd/pkg/runtime/acl" "github.com/fluxcd/pkg/runtime/client" runtimeCtrl "github.com/fluxcd/pkg/runtime/controller" @@ -34,8 +36,6 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1" sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" flag "github.com/spf13/pflag" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/controllers" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" diff --git a/cmd/runner/main.go b/cmd/runner/main.go index 0916f9b75..15bcde577 100644 --- a/cmd/runner/main.go +++ b/cmd/runner/main.go @@ -23,9 +23,9 @@ import ( "os/signal" "syscall" + "github.com/flux-iac/tofu-controller/mtls" "github.com/fluxcd/pkg/runtime/logger" flag "github.com/spf13/pflag" - "github.com/weaveworks/tf-controller/mtls" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/cmd/tfctl/main.go b/cmd/tfctl/main.go index bb96a9f38..b698a9c2a 100644 --- a/cmd/tfctl/main.go +++ b/cmd/tfctl/main.go @@ -5,9 +5,9 @@ import ( "os" "strings" + "github.com/flux-iac/tofu-controller/tfctl" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/weaveworks/tf-controller/tfctl" "k8s.io/cli-runtime/pkg/genericclioptions" ) diff --git a/controllers/cleaner_test.go b/controllers/cleaner_test.go index 36982450a..9a29a2de4 100644 --- a/controllers/cleaner_test.go +++ b/controllers/cleaner_test.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.cgithub.com/flux-iac/tofu-controller corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/get_runner_pod_object_key_test.go b/controllers/get_runner_pod_object_key_test.go index 4875f2cd2..4cc94542c 100644 --- a/controllers/get_runner_pod_object_key_test.go +++ b/controllers/get_runner_pod_object_key_test.go @@ -1,10 +1,11 @@ package controllers import ( - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + "testing" + + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "testing" . "github.com/onsi/gomega" ) diff --git a/controllers/object_encode_test.go b/controllers/object_encode_test.go index f631432d9..aceee6f19 100644 --- a/controllers/object_encode_test.go +++ b/controllers/object_encode_test.go @@ -1,10 +1,11 @@ package controllers import ( + "testing" + + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "testing" ) func TestObjectEncode(t *testing.T) { diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 5a8405998..a3c877ac6 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "github.com/weaveworks/tf-controller/mtls" - "github.com/weaveworks/tf-controller/runner" + "github.com/flux-iac/tofu-controller/mtls" + "github.com/flux-iac/tofu-controller/runner" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" @@ -39,9 +39,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/cli-utils/pkg/kstatus/polling" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" "k8s.io/client-go/rest" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/tc000010_no_outputs_test.go b/controllers/tc000010_no_outputs_test.go index c80cd588f..d2de7b2fb 100644 --- a/controllers/tc000010_no_outputs_test.go +++ b/controllers/tc000010_no_outputs_test.go @@ -9,8 +9,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000011_bad_tar_gz_no_outputs_test.go b/controllers/tc000011_bad_tar_gz_no_outputs_test.go index 9c8fdf305..a3891adfe 100644 --- a/controllers/tc000011_bad_tar_gz_no_outputs_test.go +++ b/controllers/tc000011_bad_tar_gz_no_outputs_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000011_workspace_no_outputs_test.go b/controllers/tc000011_workspace_no_outputs_test.go index be321686c..603c47d15 100644 --- a/controllers/tc000011_workspace_no_outputs_test.go +++ b/controllers/tc000011_workspace_no_outputs_test.go @@ -9,8 +9,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000012_src_bucket_no_outputs_test.go b/controllers/tc000012_src_bucket_no_outputs_test.go index 3b8e2d2b3..258507e5f 100644 --- a/controllers/tc000012_src_bucket_no_outputs_test.go +++ b/controllers/tc000012_src_bucket_no_outputs_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" diff --git a/controllers/tc000013_source_not_found_test.go b/controllers/tc000013_source_not_found_test.go index 1dc4303f2..3716042aa 100644 --- a/controllers/tc000013_source_not_found_test.go +++ b/controllers/tc000013_source_not_found_test.go @@ -18,7 +18,7 @@ import ( . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000014_artifact_not_found_test.go b/controllers/tc000014_artifact_not_found_test.go index 5d5f47bfd..1f0b66e31 100644 --- a/controllers/tc000014_artifact_not_found_test.go +++ b/controllers/tc000014_artifact_not_found_test.go @@ -18,8 +18,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000015_cliconfigsecret_cross_ns_denied_test.go b/controllers/tc000015_cliconfigsecret_cross_ns_denied_test.go index 01d47d3d6..cf51b6989 100644 --- a/controllers/tc000015_cliconfigsecret_cross_ns_denied_test.go +++ b/controllers/tc000015_cliconfigsecret_cross_ns_denied_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/tc000015_depends_on_cross_ns_denied_test.go b/controllers/tc000015_depends_on_cross_ns_denied_test.go index caf7bfff0..b17332d58 100644 --- a/controllers/tc000015_depends_on_cross_ns_denied_test.go +++ b/controllers/tc000015_depends_on_cross_ns_denied_test.go @@ -8,9 +8,9 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" fluxmeta "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/tc000015_source_cross_ns_denied_test.go b/controllers/tc000015_source_cross_ns_denied_test.go index a17123a95..8af3962d9 100644 --- a/controllers/tc000015_source_cross_ns_denied_test.go +++ b/controllers/tc000015_source_cross_ns_denied_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/tc000016_default_observed_generation_test.go b/controllers/tc000016_default_observed_generation_test.go index 875a53d7a..7aa242e71 100644 --- a/controllers/tc000016_default_observed_generation_test.go +++ b/controllers/tc000016_default_observed_generation_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/tc000016_finilize_status_test.go b/controllers/tc000016_finilize_status_test.go index c446532cb..e090b4f2f 100644 --- a/controllers/tc000016_finilize_status_test.go +++ b/controllers/tc000016_finilize_status_test.go @@ -9,7 +9,7 @@ import ( sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/rand" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/tc000020_with_backend_no_outputs_test.go b/controllers/tc000020_with_backend_no_outputs_test.go index a601df608..f7e8b2a80 100644 --- a/controllers/tc000020_with_backend_no_outputs_test.go +++ b/controllers/tc000020_with_backend_no_outputs_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000020_with_workspace_no_outputs_test.go b/controllers/tc000020_with_workspace_no_outputs_test.go index 4fe2f9a86..b73261fcf 100644 --- a/controllers/tc000020_with_workspace_no_outputs_test.go +++ b/controllers/tc000020_with_workspace_no_outputs_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000030_plan_only_no_outputs_test.go b/controllers/tc000030_plan_only_no_outputs_test.go index 04eb801db..22663ebbe 100644 --- a/controllers/tc000030_plan_only_no_outputs_test.go +++ b/controllers/tc000030_plan_only_no_outputs_test.go @@ -9,8 +9,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000031_plan_only_with_showplan_as_cm_no_outputs_test.go b/controllers/tc000031_plan_only_with_showplan_as_cm_no_outputs_test.go index a1a623e69..c179ef7c6 100644 --- a/controllers/tc000031_plan_only_with_showplan_as_cm_no_outputs_test.go +++ b/controllers/tc000031_plan_only_with_showplan_as_cm_no_outputs_test.go @@ -9,8 +9,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000040_controlled_outputs_test.go b/controllers/tc000040_controlled_outputs_test.go index 0447e93f1..7e51dfc23 100644 --- a/controllers/tc000040_controlled_outputs_test.go +++ b/controllers/tc000040_controlled_outputs_test.go @@ -9,8 +9,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000041_all_outputs_test.go b/controllers/tc000041_all_outputs_test.go index 1a11f122d..47aed2ff1 100644 --- a/controllers/tc000041_all_outputs_test.go +++ b/controllers/tc000041_all_outputs_test.go @@ -9,8 +9,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000042_output_name_contains_dot_test.go b/controllers/tc000042_output_name_contains_dot_test.go index 715e1e162..298e26027 100644 --- a/controllers/tc000042_output_name_contains_dot_test.go +++ b/controllers/tc000042_output_name_contains_dot_test.go @@ -2,14 +2,15 @@ package controllers import ( "context" - corev1 "k8s.io/api/core/v1" "testing" "time" + corev1 "k8s.io/api/core/v1" + . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000043_controlled_outputs_should_be_reconciled_test.go b/controllers/tc000043_controlled_outputs_should_be_reconciled_test.go index 7aa7ba3f2..36b30ae3e 100644 --- a/controllers/tc000043_controlled_outputs_should_be_reconciled_test.go +++ b/controllers/tc000043_controlled_outputs_should_be_reconciled_test.go @@ -2,14 +2,15 @@ package controllers import ( "context" - corev1 "k8s.io/api/core/v1" "testing" "time" + corev1 "k8s.io/api/core/v1" + . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000044_plan_only_mode_test.go b/controllers/tc000044_plan_only_mode_test.go index c938b38fd..236de36b9 100644 --- a/controllers/tc000044_plan_only_mode_test.go +++ b/controllers/tc000044_plan_only_mode_test.go @@ -10,8 +10,8 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000050_plan_and_manual_approve_no_outputs_test.go b/controllers/tc000050_plan_and_manual_approve_no_outputs_test.go index 55d32252e..001b2a233 100644 --- a/controllers/tc000050_plan_and_manual_approve_no_outputs_test.go +++ b/controllers/tc000050_plan_and_manual_approve_no_outputs_test.go @@ -4,9 +4,9 @@ import ( "os" "testing" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000051_plan_and_manual_approve_and_replan_no_outputs_test.go b/controllers/tc000051_plan_and_manual_approve_and_replan_no_outputs_test.go index a1295e197..a5d4ac39d 100644 --- a/controllers/tc000051_plan_and_manual_approve_and_replan_no_outputs_test.go +++ b/controllers/tc000051_plan_and_manual_approve_and_replan_no_outputs_test.go @@ -4,9 +4,9 @@ import ( "os" "testing" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000052_plan_and_manual_approve_with_files_test.go b/controllers/tc000052_plan_and_manual_approve_with_files_test.go index dff5a2aa7..491f35cb9 100644 --- a/controllers/tc000052_plan_and_manual_approve_with_files_test.go +++ b/controllers/tc000052_plan_and_manual_approve_with_files_test.go @@ -3,10 +3,10 @@ package controllers import ( "testing" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/utils" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/utils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000060_vars_and_controlled_outputs_test.go b/controllers/tc000060_vars_and_controlled_outputs_test.go index f6f86787c..5ef8b3f92 100644 --- a/controllers/tc000060_vars_and_controlled_outputs_test.go +++ b/controllers/tc000060_vars_and_controlled_outputs_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/tc000061_vars_hcl_input_test.go b/controllers/tc000061_vars_hcl_input_test.go index 0048d1216..674924934 100644 --- a/controllers/tc000061_vars_hcl_input_test.go +++ b/controllers/tc000061_vars_hcl_input_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/tc000062_vars_hcl_test.go b/controllers/tc000062_vars_hcl_test.go index e18ea18de..26d80e6bb 100644 --- a/controllers/tc000062_vars_hcl_test.go +++ b/controllers/tc000062_vars_hcl_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/utils" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/utils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000063_values_hcl_test.go b/controllers/tc000063_values_hcl_test.go index d25be6733..da8fe5466 100644 --- a/controllers/tc000063_values_hcl_test.go +++ b/controllers/tc000063_values_hcl_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000064_values_template_hcl_test.go b/controllers/tc000064_values_template_hcl_test.go index 0c3ad1ee2..949f36658 100644 --- a/controllers/tc000064_values_template_hcl_test.go +++ b/controllers/tc000064_values_template_hcl_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000070_varsfrom_secret_and_controlled_outputs_test.go b/controllers/tc000070_varsfrom_secret_and_controlled_outputs_test.go index 113736dec..afab1d3a1 100644 --- a/controllers/tc000070_varsfrom_secret_and_controlled_outputs_test.go +++ b/controllers/tc000070_varsfrom_secret_and_controlled_outputs_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000071_varsfrom_secret_with_varkeys_and_controlled_outputs_test.go b/controllers/tc000071_varsfrom_secret_with_varkeys_and_controlled_outputs_test.go index 5510a62fa..391f4d5a3 100644 --- a/controllers/tc000071_varsfrom_secret_with_varkeys_and_controlled_outputs_test.go +++ b/controllers/tc000071_varsfrom_secret_with_varkeys_and_controlled_outputs_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000072_varsfrom_optional_secret_controlled_outputs_test.go b/controllers/tc000072_varsfrom_optional_secret_controlled_outputs_test.go index 331480979..64a782b5f 100644 --- a/controllers/tc000072_varsfrom_optional_secret_controlled_outputs_test.go +++ b/controllers/tc000072_varsfrom_optional_secret_controlled_outputs_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000073_varsfrom_accepts_many_secrets_outputs_test.go b/controllers/tc000073_varsfrom_accepts_many_secrets_outputs_test.go index 6b13d8e04..55bb80f5b 100644 --- a/controllers/tc000073_varsfrom_accepts_many_secrets_outputs_test.go +++ b/controllers/tc000073_varsfrom_accepts_many_secrets_outputs_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000074_varsfrom_accepts_many_secrets_with_last_supplied_key_precedence_test.go b/controllers/tc000074_varsfrom_accepts_many_secrets_with_last_supplied_key_precedence_test.go index 425d6eb11..3b018cc89 100644 --- a/controllers/tc000074_varsfrom_accepts_many_secrets_with_last_supplied_key_precedence_test.go +++ b/controllers/tc000074_varsfrom_accepts_many_secrets_with_last_supplied_key_precedence_test.go @@ -8,12 +8,12 @@ import ( "path/filepath" "testing" + "github.com/flux-iac/tofu-controller/runner" "github.com/google/uuid" - "github.com/weaveworks/tf-controller/runner" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/controllers/tc000075_varsfrom_secret_with_varkeys_rename_and_controlled_outputs_test.go b/controllers/tc000075_varsfrom_secret_with_varkeys_rename_and_controlled_outputs_test.go index fc8476d8f..c53c1f36e 100644 --- a/controllers/tc000075_varsfrom_secret_with_varkeys_rename_and_controlled_outputs_test.go +++ b/controllers/tc000075_varsfrom_secret_with_varkeys_rename_and_controlled_outputs_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000080_varsfrom_configmap_and_controlled_outputs_test.go b/controllers/tc000080_varsfrom_configmap_and_controlled_outputs_test.go index 1e62af0ba..712950760 100644 --- a/controllers/tc000080_varsfrom_configmap_and_controlled_outputs_test.go +++ b/controllers/tc000080_varsfrom_configmap_and_controlled_outputs_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000081_varsfrom_accepts_many_configmap_controlled_outputs_test.go b/controllers/tc000081_varsfrom_accepts_many_configmap_controlled_outputs_test.go index 64f2ae017..afa84cf35 100644 --- a/controllers/tc000081_varsfrom_accepts_many_configmap_controlled_outputs_test.go +++ b/controllers/tc000081_varsfrom_accepts_many_configmap_controlled_outputs_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000082_varsfrom_accepts_many_configmaps_with_last_supplied_key_precedence_test.go b/controllers/tc000082_varsfrom_accepts_many_configmaps_with_last_supplied_key_precedence_test.go index e9fe98c7a..c7e2a19d2 100644 --- a/controllers/tc000082_varsfrom_accepts_many_configmaps_with_last_supplied_key_precedence_test.go +++ b/controllers/tc000082_varsfrom_accepts_many_configmaps_with_last_supplied_key_precedence_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" . "github.com/onsi/gomega" diff --git a/controllers/tc000090_varsfrom_override_and_controlled_outputs_test.go b/controllers/tc000090_varsfrom_override_and_controlled_outputs_test.go index 515a1566a..698698c44 100644 --- a/controllers/tc000090_varsfrom_override_and_controlled_outputs_test.go +++ b/controllers/tc000090_varsfrom_override_and_controlled_outputs_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/tc000100_applied_should_tx_to_plan_when_source_changed_test.go b/controllers/tc000100_applied_should_tx_to_plan_when_source_changed_test.go index c0b75bafe..6178e8147 100644 --- a/controllers/tc000100_applied_should_tx_to_plan_when_source_changed_test.go +++ b/controllers/tc000100_applied_should_tx_to_plan_when_source_changed_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000110_auto_applied_should_tx_to_plan_then_apply_when_source_changed_test.go b/controllers/tc000110_auto_applied_should_tx_to_plan_then_apply_when_source_changed_test.go index 36b2e006d..8e04bd598 100644 --- a/controllers/tc000110_auto_applied_should_tx_to_plan_then_apply_when_source_changed_test.go +++ b/controllers/tc000110_auto_applied_should_tx_to_plan_then_apply_when_source_changed_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000111_with_backend_s3_no_outputs_test.go b/controllers/tc000111_with_backend_s3_no_outputs_test.go index e10f68822..5942dabfe 100644 --- a/controllers/tc000111_with_backend_s3_no_outputs_test.go +++ b/controllers/tc000111_with_backend_s3_no_outputs_test.go @@ -16,9 +16,9 @@ import ( types2 "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/elgohr/go-localstack" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000120_delete_test.go b/controllers/tc000120_delete_test.go index e6aeecbf8..d49a5228c 100644 --- a/controllers/tc000120_delete_test.go +++ b/controllers/tc000120_delete_test.go @@ -9,8 +9,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000121_destroy_on_delete_test.go b/controllers/tc000121_destroy_on_delete_test.go index 8f62e3e9b..b96f7cd75 100644 --- a/controllers/tc000121_destroy_on_delete_test.go +++ b/controllers/tc000121_destroy_on_delete_test.go @@ -10,9 +10,9 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/utils" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/utils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000130_destroy_no_outputs_test.go b/controllers/tc000130_destroy_no_outputs_test.go index 0636b9830..e69b3150a 100644 --- a/controllers/tc000130_destroy_no_outputs_test.go +++ b/controllers/tc000130_destroy_no_outputs_test.go @@ -6,14 +6,14 @@ import ( "testing" "time" - "github.com/weaveworks/tf-controller/utils" + "github.com/flux-iac/tofu-controller/utils" apierrors "k8s.io/apimachinery/pkg/api/errors" . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000131_destroy_no_changes_test.go b/controllers/tc000131_destroy_no_changes_test.go index 4c0389133..6bd20ac6c 100644 --- a/controllers/tc000131_destroy_no_changes_test.go +++ b/controllers/tc000131_destroy_no_changes_test.go @@ -9,9 +9,9 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/utils" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/utils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000140_auto_applied_should_tx_to_plan_then_apply_when_drift_detected_test.go b/controllers/tc000140_auto_applied_should_tx_to_plan_then_apply_when_drift_detected_test.go index 7f35add29..a1a15de7c 100644 --- a/controllers/tc000140_auto_applied_should_tx_to_plan_then_apply_when_drift_detected_test.go +++ b/controllers/tc000140_auto_applied_should_tx_to_plan_then_apply_when_drift_detected_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "github.com/weaveworks/tf-controller/utils" + "github.com/flux-iac/tofu-controller/utils" . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000150_manual_apply_should_report_and_loop_when_drift_detected_test.go b/controllers/tc000150_manual_apply_should_report_and_loop_when_drift_detected_test.go index e46d53b94..9bcc04107 100644 --- a/controllers/tc000150_manual_apply_should_report_and_loop_when_drift_detected_test.go +++ b/controllers/tc000150_manual_apply_should_report_and_loop_when_drift_detected_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "github.com/weaveworks/tf-controller/utils" + "github.com/flux-iac/tofu-controller/utils" . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000160_auto_applied_should_tx_to_plan_when_unrelated_source_changed_test.go b/controllers/tc000160_auto_applied_should_tx_to_plan_when_unrelated_source_changed_test.go index 1d5231b00..52c3a23dd 100644 --- a/controllers/tc000160_auto_applied_should_tx_to_plan_when_unrelated_source_changed_test.go +++ b/controllers/tc000160_auto_applied_should_tx_to_plan_when_unrelated_source_changed_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/weaveworks/tf-controller/utils" + "github.com/flux-iac/tofu-controller/utils" . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000170_if_apply_error_we_should_delete_the_plan_and_start_over_test.go b/controllers/tc000170_if_apply_error_we_should_delete_the_plan_and_start_over_test.go index 135cdd779..e30b5ccfe 100644 --- a/controllers/tc000170_if_apply_error_we_should_delete_the_plan_and_start_over_test.go +++ b/controllers/tc000170_if_apply_error_we_should_delete_the_plan_and_start_over_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/weaveworks/tf-controller/utils" + "github.com/flux-iac/tofu-controller/utils" . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000180_should_detect_drift_test.go b/controllers/tc000180_should_detect_drift_test.go index b0657d14f..2494a0849 100644 --- a/controllers/tc000180_should_detect_drift_test.go +++ b/controllers/tc000180_should_detect_drift_test.go @@ -3,8 +3,8 @@ package controllers import ( "testing" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" ) // +kubebuilder:docs-gen:collapse=Imports diff --git a/controllers/tc000190_unsupported_source_should_error_test.go b/controllers/tc000190_unsupported_source_should_error_test.go index 6b2e082b3..d40ec65df 100644 --- a/controllers/tc000190_unsupported_source_should_error_test.go +++ b/controllers/tc000190_unsupported_source_should_error_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/controllers/tc000191_missing_source_should_error_test.go b/controllers/tc000191_missing_source_should_error_test.go index 3492dbf82..cc621c188 100644 --- a/controllers/tc000191_missing_source_should_error_test.go +++ b/controllers/tc000191_missing_source_should_error_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/controllers/tc000200_disable_drift_detection_test.go b/controllers/tc000200_disable_drift_detection_test.go index 5add69539..4255a3489 100644 --- a/controllers/tc000200_disable_drift_detection_test.go +++ b/controllers/tc000200_disable_drift_detection_test.go @@ -3,8 +3,8 @@ package controllers import ( "testing" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" ) // +kubebuilder:docs-gen:collapse=Imports diff --git a/controllers/tc000201_auto_approve_with_disabled_drift_detection_test.go b/controllers/tc000201_auto_approve_with_disabled_drift_detection_test.go index 4dbbab1c2..06fb02902 100644 --- a/controllers/tc000201_auto_approve_with_disabled_drift_detection_test.go +++ b/controllers/tc000201_auto_approve_with_disabled_drift_detection_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000210_plan_encode_decode_test.go b/controllers/tc000210_plan_encode_decode_test.go index 24bf2868b..377e73166 100644 --- a/controllers/tc000210_plan_encode_decode_test.go +++ b/controllers/tc000210_plan_encode_decode_test.go @@ -3,10 +3,11 @@ package controllers import ( "bytes" "compress/gzip" - "github.com/weaveworks/tf-controller/utils" "io/ioutil" "testing" + "github.com/flux-iac/tofu-controller/utils" + . "github.com/onsi/gomega" ) diff --git a/controllers/tc000220_support_config_file_via_secret_test.go b/controllers/tc000220_support_config_file_via_secret_test.go index 4f65451fe..e2871e656 100644 --- a/controllers/tc000220_support_config_file_via_secret_test.go +++ b/controllers/tc000220_support_config_file_via_secret_test.go @@ -12,8 +12,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000230_drift_detection_only_mode_test.go b/controllers/tc000230_drift_detection_only_mode_test.go index a5e7c2bc3..de4ddc1cc 100644 --- a/controllers/tc000230_drift_detection_only_mode_test.go +++ b/controllers/tc000230_drift_detection_only_mode_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/weaveworks/tf-controller/utils" + "github.com/flux-iac/tofu-controller/utils" . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000241_auto_approve_with_health_checks_test.go b/controllers/tc000241_auto_approve_with_health_checks_test.go index 0f46a5917..7169d0f82 100644 --- a/controllers/tc000241_auto_approve_with_health_checks_test.go +++ b/controllers/tc000241_auto_approve_with_health_checks_test.go @@ -8,10 +8,10 @@ import ( corev1 "k8s.io/api/core/v1" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" gs "github.com/onsi/gomega/gstruct" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000242_bad_health_checks_test.go b/controllers/tc000242_bad_health_checks_test.go index 129010989..38bcff1e9 100644 --- a/controllers/tc000242_bad_health_checks_test.go +++ b/controllers/tc000242_bad_health_checks_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tc000243_remediation_retry_test.go b/controllers/tc000243_remediation_retry_test.go index 0bb16af60..21045d32f 100644 --- a/controllers/tc000243_remediation_retry_test.go +++ b/controllers/tc000243_remediation_retry_test.go @@ -9,9 +9,9 @@ import ( . "github.com/onsi/gomega" controllerruntime "sigs.k8s.io/controller-runtime" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000260_runner_pod_test.go b/controllers/tc000260_runner_pod_test.go index 0dca82876..6c4ebd81b 100644 --- a/controllers/tc000260_runner_pod_test.go +++ b/controllers/tc000260_runner_pod_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000280_inventory_test.go b/controllers/tc000280_inventory_test.go index 866721ca3..b736a1bd0 100644 --- a/controllers/tc000280_inventory_test.go +++ b/controllers/tc000280_inventory_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/weaveworks/tf-controller/utils" + "github.com/flux-iac/tofu-controller/utils" . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000290_force_unlock_test.go b/controllers/tc000290_force_unlock_test.go index 3962b91f1..40bf85a04 100644 --- a/controllers/tc000290_force_unlock_test.go +++ b/controllers/tc000290_force_unlock_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/utils" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/utils" coordinationv1 "k8s.io/api/coordination/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/tc000300_targets_test.go b/controllers/tc000300_targets_test.go index 816cd82ca..636f011a1 100644 --- a/controllers/tc000300_targets_test.go +++ b/controllers/tc000300_targets_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/utils" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/utils" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/tc000310_node_selector_affinity_tolerations_test.go b/controllers/tc000310_node_selector_affinity_tolerations_test.go index 70af18379..34db22c2a 100644 --- a/controllers/tc000310_node_selector_affinity_tolerations_test.go +++ b/controllers/tc000310_node_selector_affinity_tolerations_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000311_init_container_test.go b/controllers/tc000311_init_container_test.go index d1e5d3777..519bf31af 100644 --- a/controllers/tc000311_init_container_test.go +++ b/controllers/tc000311_init_container_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000320_vol_and_vol_mounts_test.go b/controllers/tc000320_vol_and_vol_mounts_test.go index b37fc988f..3a25abf2a 100644 --- a/controllers/tc000320_vol_and_vol_mounts_test.go +++ b/controllers/tc000320_vol_and_vol_mounts_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000330_file_mapping_no_outputs_test.go b/controllers/tc000330_file_mapping_no_outputs_test.go index 9c29c6113..c45e75189 100644 --- a/controllers/tc000330_file_mapping_no_outputs_test.go +++ b/controllers/tc000330_file_mapping_no_outputs_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000340_webhooks_for_post_planning_test.go b/controllers/tc000340_webhooks_for_post_planning_test.go index 7291d678e..81cd313e2 100644 --- a/controllers/tc000340_webhooks_for_post_planning_test.go +++ b/controllers/tc000340_webhooks_for_post_planning_test.go @@ -10,9 +10,9 @@ import ( "github.com/google/uuid" . "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" "google.golang.org/grpc" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000350_depends_on_test.go b/controllers/tc000350_depends_on_test.go index 5e86d5de8..163832c16 100644 --- a/controllers/tc000350_depends_on_test.go +++ b/controllers/tc000350_depends_on_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc000360_tfvars_files_test.go b/controllers/tc000360_tfvars_files_test.go index bc2e42efb..fd099bfcc 100644 --- a/controllers/tc000360_tfvars_files_test.go +++ b/controllers/tc000360_tfvars_files_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tc009990_mtls_generate_creds_test.go b/controllers/tc009990_mtls_generate_creds_test.go index de5841a2d..56386e143 100644 --- a/controllers/tc009990_mtls_generate_creds_test.go +++ b/controllers/tc009990_mtls_generate_creds_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/mtls" sourcev1 "github.com/fluxcd/source-controller/api/v1" . "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/mtls" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tf_controller.go b/controllers/tf_controller.go index d307e1d37..593f4bd07 100644 --- a/controllers/tf_controller.go +++ b/controllers/tf_controller.go @@ -27,6 +27,8 @@ import ( "strings" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/mtls" eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1" "github.com/fluxcd/pkg/apis/meta" "github.com/fluxcd/pkg/runtime/acl" @@ -40,8 +42,6 @@ import ( sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/google/uuid" "github.com/hashicorp/go-retryablehttp" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/mtls" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" apimeta "k8s.io/apimachinery/pkg/api/meta" diff --git a/controllers/tf_controller_apply.go b/controllers/tf_controller_apply.go index 83dbad264..d18229895 100644 --- a/controllers/tf_controller_apply.go +++ b/controllers/tf_controller_apply.go @@ -7,8 +7,8 @@ import ( eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" diff --git a/controllers/tf_controller_backend.go b/controllers/tf_controller_backend.go index 3e26116a1..f9534eb90 100644 --- a/controllers/tf_controller_backend.go +++ b/controllers/tf_controller_backend.go @@ -6,10 +6,10 @@ import ( "os" "strings" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" "github.com/fluxcd/pkg/runtime/acl" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" "google.golang.org/grpc/status" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tf_controller_drift_detect.go b/controllers/tf_controller_drift_detect.go index 985a6f4e3..0fd64dfc2 100644 --- a/controllers/tf_controller_drift_detect.go +++ b/controllers/tf_controller_drift_detect.go @@ -7,8 +7,8 @@ import ( eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" "google.golang.org/grpc/status" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/controllers/tf_controller_filemapping.go b/controllers/tf_controller_filemapping.go index 38ebc3592..3090a2d91 100644 --- a/controllers/tf_controller_filemapping.go +++ b/controllers/tf_controller_filemapping.go @@ -3,8 +3,8 @@ package controllers import ( "context" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/controllers/tf_controller_finalizer.go b/controllers/tf_controller_finalizer.go index bbe7c866a..ac6bff1e2 100644 --- a/controllers/tf_controller_finalizer.go +++ b/controllers/tf_controller_finalizer.go @@ -7,10 +7,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" "github.com/fluxcd/pkg/runtime/logger" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/tf_controller_health_checks.go b/controllers/tf_controller_health_checks.go index 3ead56f9f..386f1bcfc 100644 --- a/controllers/tf_controller_health_checks.go +++ b/controllers/tf_controller_health_checks.go @@ -15,10 +15,10 @@ import ( "time" "unicode" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1" "github.com/fluxcd/pkg/runtime/logger" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/controllers/tf_controller_outputs.go b/controllers/tf_controller_outputs.go index cca9af554..fa1aa4464 100644 --- a/controllers/tf_controller_outputs.go +++ b/controllers/tf_controller_outputs.go @@ -6,11 +6,11 @@ import ( "sort" "strings" + "github.com/flux-iac/tofu-controller/api/typeinfo" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1" "github.com/hashicorp/terraform-exec/tfexec" - "github.com/weaveworks/tf-controller/api/typeinfo" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" corev1 "k8s.io/api/core/v1" diff --git a/controllers/tf_controller_plan.go b/controllers/tf_controller_plan.go index d343a8aa5..43dc2db21 100644 --- a/controllers/tf_controller_plan.go +++ b/controllers/tf_controller_plan.go @@ -4,11 +4,11 @@ import ( "context" "fmt" + "github.com/flux-iac/tofu-controller/api/planid" eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1" - "github.com/weaveworks/tf-controller/api/planid" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" "google.golang.org/grpc/status" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" diff --git a/controllers/tf_controller_reconcile.go b/controllers/tf_controller_reconcile.go index aaeb7ac1e..11f6a1c27 100644 --- a/controllers/tf_controller_reconcile.go +++ b/controllers/tf_controller_reconcile.go @@ -22,10 +22,10 @@ import ( "strings" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" "github.com/fluxcd/pkg/apis/meta" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" diff --git a/controllers/tf_controller_runner.go b/controllers/tf_controller_runner.go index dae37ba09..fab41ad83 100644 --- a/controllers/tf_controller_runner.go +++ b/controllers/tf_controller_runner.go @@ -7,10 +7,10 @@ import ( "strings" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/mtls" + "github.com/flux-iac/tofu-controller/runner" "github.com/fluxcd/pkg/runtime/logger" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/mtls" - "github.com/weaveworks/tf-controller/runner" "google.golang.org/grpc" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/tf_controller_webhooks.go b/controllers/tf_controller_webhooks.go index 8927417f8..479cc9815 100644 --- a/controllers/tf_controller_webhooks.go +++ b/controllers/tf_controller_webhooks.go @@ -14,9 +14,9 @@ import ( "strings" "text/template" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" "github.com/hashicorp/go-cleanhttp" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/kustomize/kyaml/yaml" ) diff --git a/docs/getting_started.md b/docs/getting_started.md index 692497a7f..911c757a7 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -85,15 +85,15 @@ helm upgrade -i tf-controller tf-controller/tf-controller \ ``` For details on configurable parameters of the TF-controller chart, -please see [chart readme](https://github.com/weaveworks/tf-controller/tree/main/charts/tf-controller#tf-controller-for-flux). +please see [chart readme](https://github.com/flux-iac/tofu-controller/tree/main/charts/tf-controller#tf-controller-for-flux). Alternatively, you can install TF-controller via `kubectl`: ```shell export TF_CON_VER=v0.15.1 -kubectl apply -f https://github.com/weaveworks/tf-controller/releases/download/${TF_CON_VER}/tf-controller.crds.yaml -kubectl apply -f https://github.com/weaveworks/tf-controller/releases/download/${TF_CON_VER}/tf-controller.rbac.yaml -kubectl apply -f https://github.com/weaveworks/tf-controller/releases/download/${TF_CON_VER}/tf-controller.deployment.yaml +kubectl apply -f https://github.com/flux-iac/tofu-controller/releases/download/${TF_CON_VER}/tf-controller.crds.yaml +kubectl apply -f https://github.com/flux-iac/tofu-controller/releases/download/${TF_CON_VER}/tf-controller.rbac.yaml +kubectl apply -f https://github.com/flux-iac/tofu-controller/releases/download/${TF_CON_VER}/tf-controller.deployment.yaml ``` ## Quick start diff --git a/docs/tfctl.md b/docs/tfctl.md index 4904b8233..90fcccf2e 100644 --- a/docs/tfctl.md +++ b/docs/tfctl.md @@ -10,7 +10,7 @@ To install `tfctl` via Homebrew, run the following command: brew install weaveworks/tap/tfctl ``` -You can also download the `tfctl` binary via the GitHub releases page: [https://github.com/weaveworks/tf-controller/releases](https://github.com/weaveworks/tf-controller/releases). +You can also download the `tfctl` binary via the GitHub releases page: [https://github.com/flux-iac/tofu-controller/releases](https://github.com/flux-iac/tofu-controller/releases). ``` Usage: diff --git a/docs/use-tf-controller/build-and-use-a-custom-runner-image.md b/docs/use-tf-controller/build-and-use-a-custom-runner-image.md index e6fa7a61b..aa5e122dd 100644 --- a/docs/use-tf-controller/build-and-use-a-custom-runner-image.md +++ b/docs/use-tf-controller/build-and-use-a-custom-runner-image.md @@ -29,7 +29,7 @@ RUN unzip -q /terraform_${TF_VERSION}_linux_${TARGETARCH}.zip -d /usr/local/bin/ USER 65532:65532 ``` -Find the original Dockerfile for the runner [here](https://github.com/weaveworks/tf-controller/blob/89e0c7edde91efebba825b31e9f0ef3cc583684b/runner.Dockerfile). +Find the original Dockerfile for the runner [here](https://github.com/flux-iac/tofu-controller/blob/89e0c7edde91efebba825b31e9f0ef3cc583684b/runner.Dockerfile). 2. Build the image from the directory containing the `Dockerfile` you created above: diff --git a/docs/use-tf-controller/flux-receiver-and-alert.md b/docs/use-tf-controller/flux-receiver-and-alert.md index a3928a0e1..f7e138651 100644 --- a/docs/use-tf-controller/flux-receiver-and-alert.md +++ b/docs/use-tf-controller/flux-receiver-and-alert.md @@ -10,7 +10,7 @@ installation's bootstrap manifests. Find it under the `flux-system` directory. ### Enable Notifications for Third-Party Controllers -Enable notifications for 3rd party Flux controllers such as [tf-controller](https://github.com/weaveworks/tf-controller): +Enable notifications for 3rd party Flux controllers such as [tf-controller](https://github.com/flux-iac/tofu-controller): ```yaml apiVersion: kustomize.config.k8s.io/v1beta1 diff --git a/docs/use-tf-controller/provision-resources-with-customized-runner-pods.md b/docs/use-tf-controller/provision-resources-with-customized-runner-pods.md index d90b2e88f..29b6e9ea6 100644 --- a/docs/use-tf-controller/provision-resources-with-customized-runner-pods.md +++ b/docs/use-tf-controller/provision-resources-with-customized-runner-pods.md @@ -51,7 +51,7 @@ spec: image: registry.io/tf-runner:xyz ``` -You can use [`runner.Dockerfile`](https://github.com/weaveworks/tf-controller/blob/main/runner.Dockerfile) as a basis of customizing runner pod image. +You can use [`runner.Dockerfile`](https://github.com/flux-iac/tofu-controller/blob/main/runner.Dockerfile) as a basis of customizing runner pod image. ## Customize Runner Pod Specifications diff --git a/docs/use-tf-controller/with-azure.md b/docs/use-tf-controller/with-azure.md index 8ee7591dc..09bcfb57d 100644 --- a/docs/use-tf-controller/with-azure.md +++ b/docs/use-tf-controller/with-azure.md @@ -1,6 +1,6 @@ ## Use TF-Controller with Azure -This content was [provided](https://github.com/weaveworks/tf-controller/issues/561) by users [@mingmingshiliyu](https://github.com/mingmingshiliyu) and [@maciekdude](https://github.com/maciekdude). +This content was [provided](https://github.com/flux-iac/tofu-controller/issues/561) by users [@mingmingshiliyu](https://github.com/mingmingshiliyu) and [@maciekdude](https://github.com/maciekdude). Use the OIDC flag and explicitly point to the token. Due to a bug in AzureRM 3.44.x, use version 3.47.x or later. diff --git a/go.mod b/go.mod index eb1641206..e75ebb869 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module github.com/weaveworks/tf-controller +module github.com/flux-iac/tofu-controller go 1.20 -replace github.com/weaveworks/tf-controller/api => ./api +replace github.com/flux-iac/tofu-controller/api => ./api -replace github.com/weaveworks/tf-controller/tfctl => ./tfctl +replace github.com/flux-iac/tofu-controller/tfctl => ./tfctl require ( github.com/Masterminds/sprig/v3 v3.2.3 @@ -15,6 +15,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3 v1.38.5 github.com/cyphar/filepath-securejoin v0.2.4 github.com/elgohr/go-localstack v1.0.20 + github.com/flux-iac/tofu-controller/api v0.0.0-00010101000000-000000000000 + github.com/flux-iac/tofu-controller/tfctl v0.0.0-00010101000000-000000000000 github.com/fluxcd/pkg/apis/event v0.6.0 github.com/fluxcd/pkg/apis/meta v1.2.0 github.com/fluxcd/pkg/runtime v0.43.2 @@ -37,8 +39,6 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 - github.com/weaveworks/tf-controller/api v0.0.0-00010101000000-000000000000 - github.com/weaveworks/tf-controller/tfctl v0.0.0-00010101000000-000000000000 github.com/zclconf/go-cty v1.14.1 golang.org/x/net v0.19.0 google.golang.org/grpc v1.56.3 diff --git a/internal/config/config_test.go b/internal/config/config_test.go index df4b67d14..401a5121c 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" + "github.com/flux-iac/tofu-controller/internal/config" "github.com/onsi/gomega" - "github.com/weaveworks/tf-controller/internal/config" "gopkg.in/yaml.v2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/config/naming_test.go b/internal/config/naming_test.go index 4d10a202c..1ea4c8b54 100644 --- a/internal/config/naming_test.go +++ b/internal/config/naming_test.go @@ -3,8 +3,8 @@ package config_test import ( "testing" + "github.com/flux-iac/tofu-controller/internal/config" gm "github.com/onsi/gomega" - "github.com/weaveworks/tf-controller/internal/config" ) func Test_PullRequestObjectName(t *testing.T) { diff --git a/internal/git/provider/provider_test.go b/internal/git/provider/provider_test.go index 94c0174a8..755e7e0ec 100644 --- a/internal/git/provider/provider_test.go +++ b/internal/git/provider/provider_test.go @@ -3,8 +3,8 @@ package provider_test import ( "testing" + "github.com/flux-iac/tofu-controller/internal/git/provider" "github.com/stretchr/testify/assert" - "github.com/weaveworks/tf-controller/internal/git/provider" ) func TestFromURL(t *testing.T) { @@ -16,17 +16,17 @@ func TestFromURL(t *testing.T) { shouldError bool }{ { - url: "https://github.com/weaveworks/tf-controller", + url: "https://github.com/flux-iac/tofu-controller", repoOrg: "weaveworks", repoName: "tf-controller", }, { - url: "https://github.com/weaveworks/tf-controller.git", + url: "https://github.com/flux-iac/tofu-controller.git", repoOrg: "weaveworks", repoName: "tf-controller", }, { - url: "ssh://git@github.com/weaveworks/tf-controller.git", + url: "ssh://git@github.com/flux-iac/tofu-controller.git", repoOrg: "weaveworks", repoName: "tf-controller", }, diff --git a/internal/git/provider/providerfakes/fake_provider.go b/internal/git/provider/providerfakes/fake_provider.go index 4e7c44257..c2793d632 100644 --- a/internal/git/provider/providerfakes/fake_provider.go +++ b/internal/git/provider/providerfakes/fake_provider.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-logr/logr" - "github.com/weaveworks/tf-controller/internal/git/provider" + "github.com/flux-iac/tofu-controller/internal/git/provider" ) type FakeProvider struct { diff --git a/internal/informer/branch-planner/informer.go b/internal/informer/branch-planner/informer.go index 85a5b42ef..bb2a46662 100644 --- a/internal/informer/branch-planner/informer.go +++ b/internal/informer/branch-planner/informer.go @@ -10,12 +10,12 @@ import ( "sync" "text/template" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/internal/config" + "github.com/flux-iac/tofu-controller/internal/git/provider" sourcev1 "github.com/fluxcd/source-controller/api/v1" "github.com/go-logr/logr" giturl "github.com/kubescape/go-git-url" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/internal/config" - "github.com/weaveworks/tf-controller/internal/git/provider" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/internal/informer/branch-planner/informer_test.go b/internal/informer/branch-planner/informer_test.go index f88bac9eb..e2a30de2d 100644 --- a/internal/informer/branch-planner/informer_test.go +++ b/internal/informer/branch-planner/informer_test.go @@ -10,10 +10,10 @@ import ( gom "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/client" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/internal/config" + "github.com/flux-iac/tofu-controller/internal/git/provider/providerfakes" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/internal/config" - "github.com/weaveworks/tf-controller/internal/git/provider/providerfakes" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/dynamic" diff --git a/internal/informer/branch-planner/main_test.go b/internal/informer/branch-planner/main_test.go index acdcbb960..7d1c75c22 100644 --- a/internal/informer/branch-planner/main_test.go +++ b/internal/informer/branch-planner/main_test.go @@ -14,8 +14,8 @@ import ( "github.com/onsi/gomega" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/informer/branch-planner/options.go b/internal/informer/branch-planner/options.go index 4fdd33123..5ac0ce6b8 100644 --- a/internal/informer/branch-planner/options.go +++ b/internal/informer/branch-planner/options.go @@ -1,8 +1,8 @@ package branchplanner import ( + "github.com/flux-iac/tofu-controller/internal/git/provider" "github.com/go-logr/logr" - "github.com/weaveworks/tf-controller/internal/git/provider" "k8s.io/client-go/tools/cache" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/server/polling/config.go b/internal/server/polling/config.go index d5b537dc5..f8055a6c7 100644 --- a/internal/server/polling/config.go +++ b/internal/server/polling/config.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/weaveworks/tf-controller/internal/config" + "github.com/flux-iac/tofu-controller/internal/config" ) const DefaultConfigMapName = "branch-planner" diff --git a/internal/server/polling/fake_git_provider_test.go b/internal/server/polling/fake_git_provider_test.go index 77e291b1b..533802981 100644 --- a/internal/server/polling/fake_git_provider_test.go +++ b/internal/server/polling/fake_git_provider_test.go @@ -3,8 +3,8 @@ package polling_test import ( "fmt" + "github.com/flux-iac/tofu-controller/internal/git/provider" giturl "github.com/kubescape/go-git-url" - "github.com/weaveworks/tf-controller/internal/git/provider" ) func mockedProvider(gitProvider provider.Provider) provider.URLParserFn { diff --git a/internal/server/polling/main_test.go b/internal/server/polling/main_test.go index c48098e6d..61f4dd6bc 100644 --- a/internal/server/polling/main_test.go +++ b/internal/server/polling/main_test.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" ) var ( diff --git a/internal/server/polling/option.go b/internal/server/polling/option.go index 1f6403dad..9b466cbd9 100644 --- a/internal/server/polling/option.go +++ b/internal/server/polling/option.go @@ -4,9 +4,9 @@ import ( "fmt" "time" + "github.com/flux-iac/tofu-controller/internal/config" + "github.com/flux-iac/tofu-controller/internal/git/provider" "github.com/go-logr/logr" - "github.com/weaveworks/tf-controller/internal/config" - "github.com/weaveworks/tf-controller/internal/git/provider" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/server/polling/poll_test.go b/internal/server/polling/poll_test.go index f3c488348..dbb6b0dc6 100644 --- a/internal/server/polling/poll_test.go +++ b/internal/server/polling/poll_test.go @@ -4,20 +4,20 @@ import ( "context" "testing" - "github.com/weaveworks/tf-controller/internal/config" - bpconfig "github.com/weaveworks/tf-controller/internal/config" + "github.com/flux-iac/tofu-controller/internal/config" + bpconfig "github.com/flux-iac/tofu-controller/internal/config" "k8s.io/apimachinery/pkg/labels" - "github.com/weaveworks/tf-controller/internal/git/provider/providerfakes" + "github.com/flux-iac/tofu-controller/internal/git/provider/providerfakes" "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/internal/git/provider" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/internal/git/provider" ) // This checks poll can be called with a little setting-up, with no @@ -33,7 +33,7 @@ func Test_poll_empty(t *testing.T) { Namespace: ns.Name, }, Spec: sourcev1.GitRepositorySpec{ - URL: "https://github.com/weaveworks/tf-controller", + URL: "https://github.com/flux-iac/tofu-controller", Reference: &sourcev1.GitRepositoryRef{ Branch: "main", }, @@ -298,7 +298,7 @@ func Test_poll_noPathChanges(t *testing.T) { Namespace: ns.Name, }, Spec: sourcev1.GitRepositorySpec{ - URL: "https://github.com/weaveworks/tf-controller", + URL: "https://github.com/flux-iac/tofu-controller", Reference: &sourcev1.GitRepositoryRef{ Branch: "main", }, diff --git a/internal/server/polling/server.go b/internal/server/polling/server.go index 1645661ce..944966ae3 100644 --- a/internal/server/polling/server.go +++ b/internal/server/polling/server.go @@ -11,15 +11,15 @@ import ( apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + bpconfig "github.com/flux-iac/tofu-controller/internal/config" + "github.com/flux-iac/tofu-controller/internal/git/provider" "github.com/go-logr/logr" - bpconfig "github.com/weaveworks/tf-controller/internal/config" - "github.com/weaveworks/tf-controller/internal/git/provider" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" ) const DefaultPollingInterval = time.Second * 30 diff --git a/internal/server/polling/server_test.go b/internal/server/polling/server_test.go index 76629de23..9b4cdcbe6 100644 --- a/internal/server/polling/server_test.go +++ b/internal/server/polling/server_test.go @@ -6,15 +6,15 @@ import ( "testing" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/internal/config" + "github.com/flux-iac/tofu-controller/internal/git/provider" + "github.com/flux-iac/tofu-controller/internal/git/provider/providerfakes" + "github.com/flux-iac/tofu-controller/internal/server/polling" "github.com/fluxcd/pkg/apis/meta" "github.com/fluxcd/pkg/runtime/logger" sourcev1 "github.com/fluxcd/source-controller/api/v1" "github.com/onsi/gomega" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/internal/config" - "github.com/weaveworks/tf-controller/internal/git/provider" - "github.com/weaveworks/tf-controller/internal/git/provider/providerfakes" - "github.com/weaveworks/tf-controller/internal/server/polling" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/server/polling/terraform.go b/internal/server/polling/terraform.go index 00ac2a161..48046f655 100644 --- a/internal/server/polling/terraform.go +++ b/internal/server/polling/terraform.go @@ -5,10 +5,10 @@ import ( "fmt" "time" + "github.com/flux-iac/tofu-controller/internal/config" + bpconfig "github.com/flux-iac/tofu-controller/internal/config" "github.com/fluxcd/pkg/runtime/acl" sourcev1 "github.com/fluxcd/source-controller/api/v1" - "github.com/weaveworks/tf-controller/internal/config" - bpconfig "github.com/weaveworks/tf-controller/internal/config" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -17,7 +17,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" ) func (s *Server) getTerraformObject(ctx context.Context, ref client.ObjectKey) (*infrav1.Terraform, error) { diff --git a/mkdocs.yml b/mkdocs.yml index a9dc17198..795fbaf01 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -16,7 +16,7 @@ theme: - content.code.annotate - content.code.copy -repo_url: https://github.com/weaveworks/tf-controller +repo_url: https://github.com/flux-iac/tofu-controller repo_name: weaveworks/tf-controller markdown_extensions: diff --git a/mtls/grpc.go b/mtls/grpc.go index fff78e9a7..8300f8c40 100644 --- a/mtls/grpc.go +++ b/mtls/grpc.go @@ -4,11 +4,12 @@ import ( "crypto/tls" "crypto/x509" "fmt" - "github.com/weaveworks/tf-controller/runner" + "net" + + "github.com/flux-iac/tofu-controller/runner" "google.golang.org/grpc" "google.golang.org/grpc/credentials" corev1 "k8s.io/api/core/v1" - "net" controllerruntime "sigs.k8s.io/controller-runtime" ) diff --git a/mtls/rotator.go b/mtls/rotator.go index 7f5995b1f..44dced68d 100644 --- a/mtls/rotator.go +++ b/mtls/rotator.go @@ -15,8 +15,8 @@ import ( "sync" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/pkg/errors" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/mtls/runner_serve.go b/mtls/runner_serve.go index 284266e3a..26c8c78ec 100644 --- a/mtls/runner_serve.go +++ b/mtls/runner_serve.go @@ -6,9 +6,9 @@ import ( "net" "os" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/runner" sourcev1 "github.com/fluxcd/source-controller/api/v1" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/runner" "google.golang.org/grpc" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/planner.Dockerfile b/planner.Dockerfile index 848ab5b1c..3164da181 100644 --- a/planner.Dockerfile +++ b/planner.Dockerfile @@ -37,7 +37,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \ FROM alpine:3.18 -LABEL org.opencontainers.image.source="https://github.com/weaveworks/tf-controller" +LABEL org.opencontainers.image.source="https://github.com/flux-iac/tofu-controller" ARG LIBCRYPTO_VERSION diff --git a/rfcs/README.md b/rfcs/README.md index 5654b7815..dcbea45de 100644 --- a/rfcs/README.md +++ b/rfcs/README.md @@ -1,7 +1,7 @@ # Terraform Controller RFCs In many situations, enhancements and new features are proposed -on [tf-controller/discussions](https://github.com/weaveworks/tf-controller/discussions). +on [tf-controller/discussions](https://github.com/flux-iac/tofu-controller/discussions). These proposals are evaluated publicly by maintainers, contributors, users, and any other interested parties. After a consensus is reached among the participants, the proposed changes proceed to the pull request stage where the implementation specifics are reviewed, and either approved or rejected by the maintainers. diff --git a/runner-base.Dockerfile b/runner-base.Dockerfile index 373f95441..b554e074e 100644 --- a/runner-base.Dockerfile +++ b/runner-base.Dockerfile @@ -40,7 +40,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \ FROM alpine:3.18 -LABEL org.opencontainers.image.source="https://github.com/weaveworks/tf-controller" +LABEL org.opencontainers.image.source="https://github.com/flux-iac/tofu-controller" ARG LIBCRYPTO_VERSION diff --git a/runner/read_inputs_test.go b/runner/read_inputs_test.go index de4c09426..b7bd9045d 100644 --- a/runner/read_inputs_test.go +++ b/runner/read_inputs_test.go @@ -2,14 +2,15 @@ package runner import ( "context" - . "github.com/onsi/gomega" "testing" + . "github.com/onsi/gomega" + + "github.com/flux-iac/tofu-controller/api/typeinfo" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/go-logr/logr" "github.com/hashicorp/hcl2/hcldec" "github.com/hashicorp/hcl2/hclparse" - "github.com/weaveworks/tf-controller/api/typeinfo" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" "github.com/zclconf/go-cty/cty" ctyjson "github.com/zclconf/go-cty/cty/json" corev1 "k8s.io/api/core/v1" diff --git a/runner/server.go b/runner/server.go index e247f7eaf..a43e9fe10 100644 --- a/runner/server.go +++ b/runner/server.go @@ -11,12 +11,12 @@ import ( "strings" securejoin "github.com/cyphar/filepath-securejoin" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/utils" "github.com/fluxcd/pkg/untar" "github.com/go-logr/logr" "github.com/hashicorp/terraform-exec/tfexec" tfjson "github.com/hashicorp/terraform-json" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/utils" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" corev1 "k8s.io/api/core/v1" diff --git a/runner/server_generate_tf_vars.go b/runner/server_generate_tf_vars.go index 50c0d90ea..c59f92d15 100644 --- a/runner/server_generate_tf_vars.go +++ b/runner/server_generate_tf_vars.go @@ -10,16 +10,16 @@ import ( "strings" "text/template" + "github.com/flux-iac/tofu-controller/api/typeinfo" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/utils" "github.com/go-logr/logr" - "github.com/weaveworks/tf-controller/api/typeinfo" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/utils" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/json" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime" + controllerruntime "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/runner/server_load_tfplan.go b/runner/server_load_tfplan.go index 9ccfa021b..211bb6883 100644 --- a/runner/server_load_tfplan.go +++ b/runner/server_load_tfplan.go @@ -3,13 +3,14 @@ package runner import ( "context" "fmt" - "github.com/go-logr/logr" "path/filepath" + + "github.com/go-logr/logr" "sigs.k8s.io/controller-runtime/pkg/client" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/utils" "github.com/spf13/afero" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/utils" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" diff --git a/runner/server_load_tfplan_test.go b/runner/server_load_tfplan_test.go index 75a7c7a18..bfe52d0d6 100644 --- a/runner/server_load_tfplan_test.go +++ b/runner/server_load_tfplan_test.go @@ -5,11 +5,11 @@ import ( "path/filepath" "testing" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/utils" "github.com/go-logr/logr" . "github.com/onsi/gomega" "github.com/spf13/afero" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/utils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/runner/server_outputs.go b/runner/server_outputs.go index b961a17d5..461b43357 100644 --- a/runner/server_outputs.go +++ b/runner/server_outputs.go @@ -6,8 +6,8 @@ import ( "io" "reflect" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/hashicorp/terraform-exec/tfexec" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/runner/server_save_tfplan.go b/runner/server_save_tfplan.go index 498261382..b3c3aafef 100644 --- a/runner/server_save_tfplan.go +++ b/runner/server_save_tfplan.go @@ -7,11 +7,11 @@ import ( "io/ioutil" "path/filepath" + "github.com/flux-iac/tofu-controller/api/planid" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/flux-iac/tofu-controller/utils" "github.com/go-logr/logr" - "github.com/weaveworks/tf-controller/api/planid" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" - "github.com/weaveworks/tf-controller/utils" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/runner/server_workspace_blob.go b/runner/server_workspace_blob.go index fe82ed526..ed97fe31c 100644 --- a/runner/server_workspace_blob.go +++ b/runner/server_workspace_blob.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - "github.com/weaveworks/tf-controller/internal/storage" + "github.com/flux-iac/tofu-controller/internal/storage" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" diff --git a/runner/server_workspace_blob_test.go b/runner/server_workspace_blob_test.go index ec96914fc..a0b5a2ec8 100644 --- a/runner/server_workspace_blob_test.go +++ b/runner/server_workspace_blob_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" + "github.com/flux-iac/tofu-controller/runner" "github.com/fluxcd/pkg/untar" . "github.com/onsi/gomega" - "github.com/weaveworks/tf-controller/runner" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/runner/suite_test.go b/runner/suite_test.go index 7867feec0..83b09b251 100644 --- a/runner/suite_test.go +++ b/runner/suite_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - "github.com/weaveworks/tf-controller/controllers" - "github.com/weaveworks/tf-controller/runner" + "github.com/flux-iac/tofu-controller/controllers" + "github.com/flux-iac/tofu-controller/runner" grpc "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "k8s.io/apimachinery/pkg/runtime" @@ -23,10 +23,10 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/fluxcd/pkg/runtime/logger" sourcev1 "github.com/fluxcd/source-controller/api/v1" sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" "k8s.io/client-go/rest" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/tfctl/approve_plan.go b/tfctl/approve_plan.go index d66b498a7..a27006027 100644 --- a/tfctl/approve_plan.go +++ b/tfctl/approve_plan.go @@ -7,7 +7,7 @@ import ( "io" "os" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/yaml" diff --git a/tfctl/break_glass.go b/tfctl/break_glass.go index af43137c2..268bdcce1 100644 --- a/tfctl/break_glass.go +++ b/tfctl/break_glass.go @@ -8,7 +8,7 @@ import ( "os/exec" "time" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/cli-runtime/pkg/genericclioptions" diff --git a/tfctl/create.go b/tfctl/create.go index 09edf34bd..e076d46bb 100644 --- a/tfctl/create.go +++ b/tfctl/create.go @@ -9,7 +9,7 @@ import ( "strings" "time" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" ) diff --git a/tfctl/delete_terraform.go b/tfctl/delete_terraform.go index e45bec01b..8d8d4fa9a 100644 --- a/tfctl/delete_terraform.go +++ b/tfctl/delete_terraform.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "k8s.io/apimachinery/pkg/types" ) diff --git a/tfctl/forceUnlock.go b/tfctl/forceUnlock.go index 512d97b29..dedc83406 100644 --- a/tfctl/forceUnlock.go +++ b/tfctl/forceUnlock.go @@ -6,8 +6,8 @@ import ( "io" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/fluxcd/pkg/apis/meta" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/tfctl/get.go b/tfctl/get.go index 30ab8682a..70776733f 100644 --- a/tfctl/get.go +++ b/tfctl/get.go @@ -9,9 +9,9 @@ import ( "strings" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/fluxcd/pkg/apis/meta" "github.com/hako/durafmt" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/tfctl/get_terraform.go b/tfctl/get_terraform.go index d4f1194cf..77dc12d74 100644 --- a/tfctl/get_terraform.go +++ b/tfctl/get_terraform.go @@ -5,8 +5,8 @@ import ( "io" "strconv" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/fluxcd/pkg/apis/meta" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/tfctl/go.mod b/tfctl/go.mod index 4dda674f4..cc076f108 100644 --- a/tfctl/go.mod +++ b/tfctl/go.mod @@ -1,8 +1,8 @@ -module github.com/weaveworks/tf-controller/tfctl +module github.com/flux-iac/tofu-controller/tfctl go 1.20 -replace github.com/weaveworks/tf-controller/api => ../api +replace github.com/flux-iac/tofu-controller/api => ../api require ( github.com/fluxcd/cli-utils v0.36.0-flux.2 @@ -16,7 +16,7 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.13.0 github.com/theckman/yacspin v0.13.12 - github.com/weaveworks/tf-controller/api v0.0.0-00010101000000-000000000000 + github.com/flux-iac/tofu-controller/api v0.0.0-00010101000000-000000000000 k8s.io/api v0.28.4 k8s.io/apimachinery v0.28.4 k8s.io/cli-runtime v0.28.4 diff --git a/tfctl/main.go b/tfctl/main.go index 40955719f..482179c61 100644 --- a/tfctl/main.go +++ b/tfctl/main.go @@ -14,8 +14,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/fluxcd/cli-utils/pkg/kstatus/polling" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" _ "k8s.io/client-go/plugin/pkg/client/auth" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/tfctl/reconcile.go b/tfctl/reconcile.go index 0ddcadf5e..940844c1c 100644 --- a/tfctl/reconcile.go +++ b/tfctl/reconcile.go @@ -6,8 +6,8 @@ import ( "io" "time" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/fluxcd/pkg/apis/meta" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/tfctl/replan.go b/tfctl/replan.go index e07d12d1d..705a6ca27 100644 --- a/tfctl/replan.go +++ b/tfctl/replan.go @@ -3,16 +3,17 @@ package tfctl import ( "context" "fmt" - "github.com/fluxcd/pkg/apis/meta" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" "io" + "time" + + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" + "github.com/fluxcd/pkg/apis/meta" apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" - "time" ) // clear plan pending diff --git a/tfctl/resume.go b/tfctl/resume.go index eb0830c7a..70ec38f02 100644 --- a/tfctl/resume.go +++ b/tfctl/resume.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/tfctl/show_plan.go b/tfctl/show_plan.go index 3a2ef62b5..b70449e13 100644 --- a/tfctl/show_plan.go +++ b/tfctl/show_plan.go @@ -8,8 +8,8 @@ import ( "io" "io/ioutil" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/fluxcd/pkg/apis/meta" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" corev1 "k8s.io/api/core/v1" apimeta "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/types" diff --git a/tfctl/show_plan_test.go b/tfctl/show_plan_test.go index c204819c1..9177cc9c0 100644 --- a/tfctl/show_plan_test.go +++ b/tfctl/show_plan_test.go @@ -6,12 +6,12 @@ import ( "os" "testing" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "github.com/hashicorp/go-version" hc "github.com/hashicorp/hc-install" "github.com/hashicorp/hc-install/fs" "github.com/hashicorp/hc-install/product" "github.com/hashicorp/hc-install/src" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/tfctl/suspend.go b/tfctl/suspend.go index fbf689857..3b97249b2 100644 --- a/tfctl/suspend.go +++ b/tfctl/suspend.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - infrav1 "github.com/weaveworks/tf-controller/api/v1alpha2" + infrav1 "github.com/flux-iac/tofu-controller/api/v1alpha2" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client"