feat: rename api module name (apis -> api) (open-feature#823)

toddbaert · Y0sh1dk · commit b6e1f6d463b7 · 2026-04-22T19:50:34.000+10:00
Signed-off-by: Todd Baert &lt;todd.baert@dynatrace.com&gt;
diff --git a/PROJECT b/PROJECT
@@ -18,7 +18,7 @@ resources:
   domain: openfeature.dev
   group: core
   kind: FeatureFlagConfiguration
-  path: github.com/open-feature/open-feature-operator/apis/core/v1alpha1
+  path: github.com/open-feature/open-feature-operator/api/core/v1alpha1
   version: v1alpha1
   webhooks:
     conversion: true
@@ -29,7 +29,7 @@ resources:
   domain: openfeature.dev
   group: core
   kind: FeatureFlagConfiguration
-  path: github.com/open-feature/open-feature-operator/apis/core/v1alpha2
+  path: github.com/open-feature/open-feature-operator/api/core/v1alpha2
   version: v1alpha2
 - api:
     crdVersion: v1
@@ -38,7 +38,7 @@ resources:
   domain: openfeature.dev
   group: core
   kind: FlagSourceConfiguration
-  path: github.com/open-feature/open-feature-operator/apis/core/v1alpha1
+  path: github.com/open-feature/open-feature-operator/api/core/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
@@ -47,15 +47,15 @@ resources:
   domain: openfeature.dev
   group: core
   kind: FlagSourceConfiguration
-  path: github.com/open-feature/open-feature-operator/apis/core/v1alpha3
+  path: github.com/open-feature/open-feature-operator/api/core/v1alpha3
   version: v1alpha3
 - api:
     crdVersion: v1
     namespaced: true
   domain: openfeature.dev
   group: core
   kind: FeatureFlag
-  path: github.com/open-feature/open-feature-operator/apis/core/v1beta1
+  path: github.com/open-feature/open-feature-operator/api/core/v1beta1
   version: v1beta1
   webhooks:
     validation: true
@@ -66,7 +66,7 @@ resources:
   domain: openfeature.dev
   group: core
   kind: FeatureFlagSource
-  path: github.com/open-feature/open-feature-operator/apis/core/v1beta1
+  path: github.com/open-feature/open-feature-operator/api/core/v1beta1
   version: v1beta1
 - api:
     crdVersion: v1
@@ -75,14 +75,14 @@ resources:
   domain: openfeature.dev
   group: core
   kind: Flagd
-  path: github.com/open-feature/open-feature-operator/apis/core/v1beta1
+  path: github.com/open-feature/open-feature-operator/api/core/v1beta1
   version: v1beta1
 - api:
     crdVersion: v1
     namespaced: true
   domain: openfeature.dev
   group: core
   kind: InProcessConfiguration
-  path: github.com/open-feature/open-feature-operator/apis/core/v1beta1
+  path: github.com/open-feature/open-feature-operator/api/core/v1beta1
   version: v1beta1
 version: "3"
diff --git a/api/core/v1beta1/featureflag_types.go b/api/core/v1beta1/featureflag_types.go
@@ -19,7 +19,7 @@ package v1beta1
 import (
 	"encoding/json"
 
-	"github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"
+	"github.com/open-feature/open-feature-operator/api/core/v1beta1/common"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/api/core/v1beta1/featureflag_types_test.go b/api/core/v1beta1/featureflag_types_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"
+	"github.com/open-feature/open-feature-operator/api/core/v1beta1/common"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/api/core/v1beta1/featureflagsource_types.go b/api/core/v1beta1/featureflagsource_types.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"
+	"github.com/open-feature/open-feature-operator/api/core/v1beta1/common"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/api/core/v1beta1/featureflagsource_types_test.go b/api/core/v1beta1/featureflagsource_types_test.go
@@ -3,7 +3,7 @@ package v1beta1
 import (
 	"testing"
 
-	"github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"
+	"github.com/open-feature/open-feature-operator/api/core/v1beta1/common"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
diff --git a/api/core/v1beta1/inprocessconfiguration_types.go b/api/core/v1beta1/inprocessconfiguration_types.go
@@ -19,7 +19,7 @@ package v1beta1
 import (
 	"fmt"
 
-	"github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"
+	"github.com/open-feature/open-feature-operator/api/core/v1beta1/common"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/api/go.mod b/api/go.mod
@@ -1,4 +1,4 @@
-module github.com/open-feature/open-feature-operator/apis
+module github.com/open-feature/open-feature-operator/api
 
 go 1.25.0
 
diff --git a/cmd/main.go b/cmd/main.go
@@ -28,7 +28,7 @@ import (
 	"time"
 
 	"github.com/kelseyhightower/envconfig"
-	corev1beta1 "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	corev1beta1 "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/open-feature/open-feature-operator/internal/common/flagdinjector"
 	"github.com/open-feature/open-feature-operator/internal/common/flagdproxy"
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/open-feature/flagd-schemas v0.2.9-0.20250529171004-2852d7772e6b
-	github.com/open-feature/open-feature-operator/apis v0.2.45
+	github.com/open-feature/open-feature-operator/api v0.2.45
 	github.com/stretchr/testify v1.11.1
 	github.com/xeipuuv/gojsonschema v1.2.0
 	go.uber.org/zap v1.27.0
@@ -48,7 +48,6 @@ require (
 	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20250125003558-7fdb3d7e6fa0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -106,3 +105,5 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
+
+replace github.com/open-feature/open-feature-operator/api => ./api
diff --git a/go.sum b/go.sum
@@ -101,8 +101,6 @@ github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
 github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 github.com/open-feature/flagd-schemas v0.2.9-0.20250529171004-2852d7772e6b h1:BThJr+zA4uku7BGDkzjwf7eMQZDEdnpXricDphI5y94=
 github.com/open-feature/flagd-schemas v0.2.9-0.20250529171004-2852d7772e6b/go.mod h1:WKtwo1eW9/K6D+4HfgTXWBqCDzpvMhDa5eRxW7R5B2U=
-github.com/open-feature/open-feature-operator/apis v0.2.45 h1:URnUf22ZoAx7/W8ek8dXCBYgY8FmnFEuEOSDLROQafY=
-github.com/open-feature/open-feature-operator/apis v0.2.45/go.mod h1:PYh/Hfyna1lZYZUeu/8LM0qh0ZgpH7kKEXRLYaaRhGs=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
diff --git a/internal/common/common.go b/internal/common/common.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	appsV1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/common/common_test.go b/internal/common/common_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"github.com/stretchr/testify/require"
 	appsV1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
diff --git a/internal/common/flagdinjector/fake/flagdinjector_mock.go b/internal/common/flagdinjector/fake/flagdinjector_mock.go
diff --git a/internal/common/flagdinjector/flagdinjector.go b/internal/common/flagdinjector/flagdinjector.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
-	apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
+	apicommon "github.com/open-feature/open-feature-operator/api/core/v1beta1/common"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/open-feature/open-feature-operator/internal/common/flagdproxy"
 	"github.com/open-feature/open-feature-operator/internal/common/types"
diff --git a/internal/common/flagdinjector/flagdinjector_test.go b/internal/common/flagdinjector/flagdinjector_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/go-logr/logr/testr"
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
-	apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
+	apicommon "github.com/open-feature/open-feature-operator/api/core/v1beta1/common"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/open-feature/open-feature-operator/internal/common/flagdproxy"
 	"github.com/open-feature/open-feature-operator/internal/common/utils"
diff --git a/internal/common/flagdinjector/mock/flagd-injector.go b/internal/common/flagdinjector/mock/flagd-injector.go
diff --git a/internal/controller/core/featureflagsource/controller.go b/internal/controller/core/featureflagsource/controller.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/open-feature/open-feature-operator/internal/common/flagdproxy"
 	"github.com/open-feature/open-feature-operator/internal/common/utils"
diff --git a/internal/controller/core/featureflagsource/controller_test.go b/internal/controller/core/featureflagsource/controller_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
-	apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
+	apicommon "github.com/open-feature/open-feature-operator/api/core/v1beta1/common"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/open-feature/open-feature-operator/internal/common/flagdproxy"
 	commontypes "github.com/open-feature/open-feature-operator/internal/common/types"
diff --git a/internal/controller/core/flagd/controller.go b/internal/controller/core/flagd/controller.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	resources2 "github.com/open-feature/open-feature-operator/internal/controller/core/flagd/common"
 	"github.com/open-feature/open-feature-operator/internal/controller/core/flagd/resources"
 	appsv1 "k8s.io/api/apps/v1"
diff --git a/internal/controller/core/flagd/controller_test.go b/internal/controller/core/flagd/controller_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	resources "github.com/open-feature/open-feature-operator/internal/controller/core/flagd/common"
 	commonmock "github.com/open-feature/open-feature-operator/internal/controller/core/flagd/mock"
 	resourcemock "github.com/open-feature/open-feature-operator/internal/controller/core/flagd/resources/mock"
diff --git a/internal/controller/core/flagd/mock/mock.go b/internal/controller/core/flagd/mock/mock.go
diff --git a/internal/controller/core/flagd/resource_reconciler.go b/internal/controller/core/flagd/resource_reconciler.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/open-feature/open-feature-operator/internal/controller/core/flagd/resources"
 	"k8s.io/apimachinery/pkg/api/errors"
diff --git a/internal/controller/core/flagd/resource_reconciler_test.go b/internal/controller/core/flagd/resource_reconciler_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	resourcemock "github.com/open-feature/open-feature-operator/internal/controller/core/flagd/resources/mock"
 	"github.com/stretchr/testify/require"
diff --git a/internal/controller/core/flagd/resources/deployment.go b/internal/controller/core/flagd/resources/deployment.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 
 	"github.com/go-logr/logr"
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/open-feature/open-feature-operator/internal/common/flagdinjector"
 	"github.com/open-feature/open-feature-operator/internal/controller/core/flagd/common"
diff --git a/internal/controller/core/flagd/resources/deployment_test.go b/internal/controller/core/flagd/resources/deployment_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	commonfake "github.com/open-feature/open-feature-operator/internal/common/flagdinjector/fake"
 	resources "github.com/open-feature/open-feature-operator/internal/controller/core/flagd/common"
 	"github.com/stretchr/testify/require"
diff --git a/internal/controller/core/flagd/resources/gateway_api.go b/internal/controller/core/flagd/resources/gateway_api.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/open-feature/open-feature-operator/internal/controller/core/flagd/common"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/controller/core/flagd/resources/gateway_api_test.go b/internal/controller/core/flagd/resources/gateway_api_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/controller/core/flagd/resources/ingress.go b/internal/controller/core/flagd/resources/ingress.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	resources "github.com/open-feature/open-feature-operator/internal/controller/core/flagd/common"
 	networkingv1 "k8s.io/api/networking/v1"
diff --git a/internal/controller/core/flagd/resources/ingress_test.go b/internal/controller/core/flagd/resources/ingress_test.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"testing"
 
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
diff --git a/internal/controller/core/flagd/resources/interface.go b/internal/controller/core/flagd/resources/interface.go
@@ -3,7 +3,7 @@ package resources
 import (
 	"context"
 
-	"github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	"github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
diff --git a/internal/controller/core/flagd/resources/mock/mock.go b/internal/controller/core/flagd/resources/mock/mock.go
diff --git a/internal/controller/core/flagd/resources/service.go b/internal/controller/core/flagd/resources/service.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"reflect"
 
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/open-feature/open-feature-operator/internal/controller/core/flagd/common"
 	v1 "k8s.io/api/core/v1"
diff --git a/internal/controller/core/flagd/resources/service_test.go b/internal/controller/core/flagd/resources/service_test.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"testing"
 
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/webhook/common.go b/internal/webhook/common.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
-	apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
+	apicommon "github.com/open-feature/open-feature-operator/api/core/v1beta1/common"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/open-feature/open-feature-operator/internal/common/types"
 	corev1 "k8s.io/api/core/v1"
diff --git a/internal/webhook/common_test.go b/internal/webhook/common_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	api "github.com/open-feature/open-feature-operator/apis/core/v1beta1"
-	apicommon "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"
+	api "github.com/open-feature/open-feature-operator/api/core/v1beta1"
+	apicommon "github.com/open-feature/open-feature-operator/api/core/v1beta1/common"
 	"github.com/open-feature/open-feature-operator/internal/common"
 	"github.com/open-feature/open-feature-operator/internal/common/types"
 	"github.com/stretchr/testify/require"
diff --git a/internal/webhook/featureflag_webhook.go b/internal/webhook/featureflag_webhook.go
diff --git a/internal/webhook/featureflag_webhook_test.go b/internal/webhook/featureflag_webhook_test.go
diff --git a/internal/webhook/pod_webhook.go b/internal/webhook/pod_webhook.go
diff --git a/internal/webhook/pod_webhook_test.go b/internal/webhook/pod_webhook_test.go
diff --git a/release-please-config.json b/release-please-config.json

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package v1beta1`
`19`	`19`	`import (`
`20`	`20`	`"encoding/json"`
`21`	`21`
`22`		`- "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"`
	`22`	`+ "github.com/open-feature/open-feature-operator/api/core/v1beta1/common"`
`23`	`23`	`corev1 "k8s.io/api/core/v1"`
`24`	`24`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`25`	`25`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"fmt"`
`21`	`21`	`"strings"`
`22`	`22`
`23`		`- "github.com/open-feature/open-feature-operator/apis/core/v1beta1/common"`
	`23`	`+ "github.com/open-feature/open-feature-operator/api/core/v1beta1/common"`
`24`	`24`	`corev1 "k8s.io/api/core/v1"`
`25`	`25`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`26`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/open-feature/open-feature-operator/apis`
	`1`	`+module github.com/open-feature/open-feature-operator/api`
`2`	`2`
`3`	`3`	`go 1.25.0`
`4`	`4`