Merge pull request #23 from AlexGacon/master

Fix error in gwc layer resource format
camptocamp · Dec 18, 2023 · 1553dc0 · 1553dc0
2 parents cb49b9c + 22ef3b5
commit 1553dc0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/geoserver/resource_geoserver_wmslayer.go b/geoserver/resource_geoserver_wmslayer.go
@@ -34,92 +34,114 @@ func resourceGeoserverWmsLayer() *schema.Resource {
 			"name": {
 				Type:     schema.TypeString,
 				Required: true,
+				ForceNew: true,
 			},
 			"native_name": {
 				Type:     schema.TypeString,
 				Required: true,
+				ForceNew: true,
 			},
 			"enabled": {
 				Type:     schema.TypeBool,
 				Optional: true,
 				Default:  true,
+				ForceNew: true,
 			},
 			"projection_policy": {
 				Type:     schema.TypeString,
 				Required: true,
+				ForceNew: true,
 			},
 			"title": {
 				Type:     schema.TypeString,
 				Optional: true,
+				ForceNew: true,
 			},
 			"abstract": {
 				Type:     schema.TypeString,
 				Optional: true,
+				ForceNew: true,
 			},
 			"native_crs_class": {
 				Type:     schema.TypeString,
 				Optional: true,
+				ForceNew: true,
 			},
 			"native_crs_value": {
 				Type:     schema.TypeString,
 				Optional: true,
+				ForceNew: true,
 			},
 			"srs": {
 				Type:     schema.TypeString,
 				Required: true,
+				ForceNew: true,
 			},
 			"native_bounding_box_min_x": {
 				Type:     schema.TypeFloat,
 				Optional: true,
+				ForceNew: true,
 			},
 			"native_bounding_box_max_x": {
 				Type:     schema.TypeFloat,
 				Optional: true,
+				ForceNew: true,
 			},
 			"native_bounding_box_min_y": {
 				Type:     schema.TypeFloat,
 				Optional: true,
+				ForceNew: true,
 			},
 			"native_bounding_box_max_y": {
 				Type:     schema.TypeFloat,
 				Optional: true,
+				ForceNew: true,
 			},
 			"native_bounding_box_crs_class": {
 				Type:     schema.TypeString,
 				Optional: true,
+				ForceNew: true,
 			},
 			"native_bounding_box_crs_value": {
 				Type:     schema.TypeString,
 				Optional: true,
+				ForceNew: true,
 			},
 			"lat_lon_bounding_box_min_x": {
 				Type:     schema.TypeFloat,
 				Optional: true,
+				ForceNew: true,
 			},
 			"lat_lon_bounding_box_max_x": {
 				Type:     schema.TypeFloat,
 				Optional: true,
+				ForceNew: true,
 			},
 			"lat_lon_bounding_box_min_y": {
 				Type:     schema.TypeFloat,
 				Optional: true,
+				ForceNew: true,
 			},
 			"lat_lon_bounding_box_max_y": {
 				Type:     schema.TypeFloat,
 				Optional: true,
+				ForceNew: true,
 			},
 			"lat_lon_bounding_box_crs_class": {
 				Type:     schema.TypeString,
 				Optional: true,
+				ForceNew: true,
 			},
 			"lat_lon_bounding_box_crs_value": {
 				Type:     schema.TypeString,
 				Optional: true,
+				ForceNew: true,
 			},
 			"metadata": {
 				Type:     schema.TypeMap,
 				Optional: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
+				ForceNew: true,
 			},
 		},
 	}

diff --git a/geoserver/resource_gwc_wms_layer.go b/geoserver/resource_gwc_wms_layer.go
@@ -258,7 +258,7 @@ func resourceGwcWmsLayerRead(d *schema.ResourceData, meta interface{}) error {
 		})
 	}
 
-	d.Set("grid_subsets", gridsubsets)
+	d.Set("grid_subset", gridsubsets)
 
 	return nil
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		})
     	}
-    	d.Set("grid_subsets", gridsubsets)
+    	d.Set("grid_subset", gridsubsets)
     	return nil
     }
@@ Expand Down @@