validate against ending slash on base_directory field in opslevel_ser…

…vice_repository (#468)
OpsLevel · Aug 30, 2024 · 663ee0d · 663ee0d
1 parent f7a97dd
commit 663ee0d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.changes/unreleased/Bugfix-20240830-094953.yaml b/.changes/unreleased/Bugfix-20240830-094953.yaml
@@ -0,0 +1,3 @@
+kind: Bugfix
+body: correctly reject ending slash on base_directory field in opslevel_service_repository
+time: 2024-08-30T09:49:53.207297-05:00
diff --git a/examples/resources/opslevel_service_repository/resource.tf b/examples/resources/opslevel_service_repository/resource.tf
@@ -11,13 +11,13 @@ resource "opslevel_service_repository" "foo" {
   repository = data.opslevel_repository.foo.id
 
   name           = "Foo"
-  base_directory = "example/"
+  base_directory = "example"
 }
 
 resource "opslevel_service_repository" "bar" {
   service_alias    = "bar"
   repository_alias = "github.com:example/bar"
 
   name           = "Bar"
-  base_directory = "example/subdir/"
+  base_directory = "example/subdir"
 }
diff --git a/opslevel/resource_opslevel_service_repository.go b/opslevel/resource_opslevel_service_repository.go
@@ -78,8 +78,8 @@ func (r *ServiceRepositoryResource) Schema(ctx context.Context, req resource.Sch
 				Optional:    true,
 				Validators: []validator.String{
 					stringvalidator.RegexMatches(
-						regexp.MustCompile(`^[^\/].*`),
-						"path must not start with '/'",
+						regexp.MustCompile(`^[^\/].*[^\/]$`),
+						"path must not start or end with '/'",
 					),
 				},
 			},