From 80bcdba70cbc0c8ecf01f8469f1c8bb0d2228f98 Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Thu, 14 Nov 2024 08:38:04 +0100 Subject: [PATCH] feat: rename folderUid to folder --- pkg/apis/provisioning/v0alpha1/types.go | 5 +++-- pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go | 4 ++-- .../v0alpha1/zz_generated.openapi_violation_exceptions.list | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/apis/provisioning/v0alpha1/types.go b/pkg/apis/provisioning/v0alpha1/types.go index 9beadca73fc..6e8f8654b6c 100644 --- a/pkg/apis/provisioning/v0alpha1/types.go +++ b/pkg/apis/provisioning/v0alpha1/types.go @@ -62,8 +62,9 @@ func (r *GitHubRepository) IsEmpty() bool { } type RepositorySpec struct { - // The UID of the folder that is backed by the repository. - FolderUID string `json:"folderUid,omitempty"` + // The folder that is backed by the repository. + // The value is a reference to the Kubernetes metadata name of the folder in the same namespace. + Folder string `json:"folder,omitempty"` // The repository on the local file system. // Mutually exclusive with s3 and github. diff --git a/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go b/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go index 7a16d193e6b..f3abb64d6e5 100644 --- a/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go +++ b/pkg/apis/provisioning/v0alpha1/zz_generated.openapi.go @@ -173,9 +173,9 @@ func schema_pkg_apis_provisioning_v0alpha1_RepositorySpec(ref common.ReferenceCa SchemaProps: spec.SchemaProps{ Type: []string{"object"}, Properties: map[string]spec.Schema{ - "folderUid": { + "folder": { SchemaProps: spec.SchemaProps{ - Description: "The UID of the folder that is backed by the repository.", + Description: "The folder that is backed by the repository. The value is a reference to the Kubernetes metadata name of the folder in the same namespace.", Type: []string{"string"}, Format: "", }, diff --git a/pkg/apis/provisioning/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/provisioning/v0alpha1/zz_generated.openapi_violation_exceptions.list index 9be97c7d3c2..4f438a48a12 100644 --- a/pkg/apis/provisioning/v0alpha1/zz_generated.openapi_violation_exceptions.list +++ b/pkg/apis/provisioning/v0alpha1/zz_generated.openapi_violation_exceptions.list @@ -1,2 +1 @@ -API rule violation: names_match,github.com/grafana/grafana/pkg/apis/provisioning/v0alpha1,RepositorySpec,FolderUID API rule violation: names_match,github.com/grafana/grafana/pkg/apis/provisioning/v0alpha1,RepositorySpec,GitHub