Updated dynatrace_log_timestamp resource

Author: kishikawa12

dynatrace/api/builtin/logmonitoring/timestampconfiguration/schema.json

@@ -180,6 +180,17 @@
 			"nullable": false,
 			"type": "boolean"
 		},
+		"entry-boundary": {
+			"description": "Optional field. Enter a fragment of the line text that starts the entry. No support for wildcards - the text is treated literally.",
+			"displayName": "Entry boundary pattern",
+			"documentation": "",
+			"maxObjects": 1,
+			"modificationPolicy": "DEFAULT",
+			"nullable": true,
+			"type": {
+				"$ref": "#/types/EntryBoundary"
+			}
+		},
 		"matchers": {
 			"description": "",
 			"displayName": "",
@@ -244,6 +255,33 @@
 	],
 	"schemaId": "builtin:logmonitoring.timestamp-configuration",
 	"types": {
+		"EntryBoundary": {
+			"description": "",
+			"displayName": "EntryBoundary",
+			"documentation": "",
+			"properties": {
+				"pattern": {
+					"constraints": [
+						{
+							"maxLength": 500,
+							"minLength": 1,
+							"type": "LENGTH"
+						}
+					],
+					"description": "",
+					"displayName": "",
+					"documentation": "",
+					"maxObjects": 1,
+					"modificationPolicy": "DEFAULT",
+					"nullable": true,
+					"type": "text"
+				}
+			},
+			"summaryPattern": "",
+			"type": "object",
+			"version": "0",
+			"versionInfo": ""
+		},
 		"Matcher": {
 			"constraints": [
 				{
@@ -351,12 +389,17 @@
 					"displayName": "Timestamp Search Limit",
 					"id": "dateSearchLimit",
 					"propertyRef": "date-search-limit"
+				},
+				{
+					"displayName": "Entry boundary",
+					"id": "entryBoundary",
+					"propertyRef": "entry-boundary/pattern"
 				}
 			],
 			"emptyState": {
 				"text": "**Create your first rule**\n\nAdd the first rule to configure timestamp patterns"
 			}
 		}
 	},
-	"version": "1.0.8"
+	"version": "1.0.9"
 }

dynatrace/api/builtin/logmonitoring/timestampconfiguration/service.go

@@ -23,7 +23,7 @@ import (
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings/services/settings20"
 )
 
-const SchemaVersion = "1.0.8"
+const SchemaVersion = "1.0.9"
 const SchemaID = "builtin:logmonitoring.timestamp-configuration"
 
 func Service(credentials *settings.Credentials) settings.CRUDService[*timestampconfiguration.Settings] {

dynatrace/api/builtin/logmonitoring/timestampconfiguration/settings/entry_boundary.go

@@ -0,0 +1,49 @@
+/**
+* @license
+* Copyright 2020 Dynatrace LLC
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+ */
+
+package timestampconfiguration
+
+import (
+	"github.com/dynatrace-oss/terraform-provider-dynatrace/terraform/hcl"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+type EntryBoundary struct {
+	Pattern *string `json:"pattern,omitempty"`
+}
+
+func (me *EntryBoundary) Schema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"pattern": {
+			Type:        schema.TypeString,
+			Description: "no documentation available",
+			Optional:    true, // nullable
+		},
+	}
+}
+
+func (me *EntryBoundary) MarshalHCL(properties hcl.Properties) error {
+	return properties.EncodeAll(map[string]any{
+		"pattern": me.Pattern,
+	})
+}
+
+func (me *EntryBoundary) UnmarshalHCL(decoder hcl.Decoder) error {
+	return decoder.DecodeAll(map[string]any{
+		"pattern": &me.Pattern,
+	})
+}

dynatrace/api/builtin/logmonitoring/timestampconfiguration/settings/settings.go

@@ -23,14 +23,15 @@ import (
 )
 
 type Settings struct {
-	Config_item_title string   `json:"config-item-title"`           // Name
-	Date_search_limit *int     `json:"date-search-limit,omitempty"` // (v1.275) Defines the number of characters in every log line (starting from the first character in the line) where the timestamp is searched.
-	Date_time_pattern string   `json:"date-time-pattern"`           // Date-time pattern
-	Enabled           bool     `json:"enabled"`                     // This setting is enabled (`true`) or disabled (`false`)
-	Matchers          Matchers `json:"matchers,omitempty"`
-	Scope             *string  `json:"-" scope:"scope"` // The scope of this setting (HOST, HOST_GROUP). Omit this property if you want to cover the whole environment.
-	Timezone          string   `json:"timezone"`        // Timezone
-	InsertAfter       string   `json:"-"`
+	Config_item_title string         `json:"config-item-title"`           // Name
+	Date_search_limit *int           `json:"date-search-limit,omitempty"` // Defines the number of characters in every log line (starting from the first character in the line) where the timestamp is searched.
+	Date_time_pattern string         `json:"date-time-pattern"`           // Date-time pattern
+	Enabled           bool           `json:"enabled"`                     // This setting is enabled (`true`) or disabled (`false`)
+	Entry_boundary    *EntryBoundary `json:"entry-boundary,omitempty"`    // Optional field. Enter a fragment of the line text that starts the entry. No support for wildcards - the text is treated literally.
+	Matchers          Matchers       `json:"matchers,omitempty"`
+	Scope             *string        `json:"-" scope:"scope"` // The scope of this setting (HOST, HOST_GROUP). Omit this property if you want to cover the whole environment.
+	Timezone          string         `json:"timezone"`        // Timezone
+	InsertAfter       string         `json:"-"`
 }
 
 func (me *Settings) Name() string {
@@ -46,7 +47,7 @@ func (me *Settings) Schema() map[string]*schema.Schema {
 		},
 		"date_search_limit": {
 			Type:        schema.TypeInt,
-			Description: "(v1.275) Defines the number of characters in every log line (starting from the first character in the line) where the timestamp is searched.",
+			Description: "Defines the number of characters in every log line (starting from the first character in the line) where the timestamp is searched.",
 			Optional:    true, // nullable
 		},
 		"date_time_pattern": {
@@ -59,10 +60,18 @@ func (me *Settings) Schema() map[string]*schema.Schema {
 			Description: "This setting is enabled (`true`) or disabled (`false`)",
 			Required:    true,
 		},
+		"entry_boundary": {
+			Type:        schema.TypeList,
+			Description: "Optional field. Enter a fragment of the line text that starts the entry. No support for wildcards - the text is treated literally.",
+			Optional:    true, // nullable
+			Elem:        &schema.Resource{Schema: new(EntryBoundary).Schema()},
+			MinItems:    1,
+			MaxItems:    1,
+		},
 		"matchers": {
 			Type:        schema.TypeList,
 			Description: "no documentation available",
-			Optional:    true,
+			Optional:    true, // minobjects == 0
 			Elem:        &schema.Resource{Schema: new(Matchers).Schema()},
 			MinItems:    1,
 			MaxItems:    1,
@@ -72,7 +81,6 @@ func (me *Settings) Schema() map[string]*schema.Schema {
 			Description: "The scope of this setting (HOST, HOST_GROUP). Omit this property if you want to cover the whole environment.",
 			Optional:    true,
 			Default:     "environment",
-			ForceNew:    true,
 		},
 		"timezone": {
 			Type:        schema.TypeString,
@@ -94,6 +102,7 @@ func (me *Settings) MarshalHCL(properties hcl.Properties) error {
 		"date_search_limit": me.Date_search_limit,
 		"date_time_pattern": me.Date_time_pattern,
 		"enabled":           me.Enabled,
+		"entry_boundary":    me.Entry_boundary,
 		"matchers":          me.Matchers,
 		"scope":             me.Scope,
 		"timezone":          me.Timezone,
@@ -107,6 +116,7 @@ func (me *Settings) UnmarshalHCL(decoder hcl.Decoder) error {
 		"date_search_limit": &me.Date_search_limit,
 		"date_time_pattern": &me.Date_time_pattern,
 		"enabled":           &me.Enabled,
+		"entry_boundary":    &me.Entry_boundary,
 		"matchers":          &me.Matchers,
 		"scope":             &me.Scope,
 		"timezone":          &me.Timezone,