STAC-24049: resolve conflicts

Author: deontaljaard

generated/stackstate_api/api/openapi.yaml

@@ -14939,6 +14939,7 @@ components:
           signal:
           - null
           - null
+        _type: OtelComponentMapping
         name: name
         description: description
         expireAfter: 0
@@ -14948,6 +14949,10 @@ components:
         - name: name
           value: value
       properties:
+        _type:
+          enum:
+          - OtelComponentMapping
+          type: string
         identifier:
           type: string
         name:
@@ -14966,6 +14971,7 @@ components:
           format: int64
           type: integer
       required:
+      - _type
       - expireAfter
       - identifier
       - input
@@ -15138,6 +15144,7 @@ components:
           signal:
           - null
           - null
+        _type: OtelRelationMapping
         name: name
         description: description
         expireAfter: 0
@@ -15147,6 +15154,10 @@ components:
         - name: name
           value: value
       properties:
+        _type:
+          enum:
+          - OtelRelationMapping
+          type: string
         identifier:
           type: string
         name:
@@ -15165,6 +15176,7 @@ components:
           format: int64
           type: integer
       required:
+      - _type
       - expireAfter
       - identifier
       - input

generated/stackstate_api/docs/OtelComponentMapping.md

@@ -4,6 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**Type** | **string** |  | 
 **Identifier** | **string** |  | 
 **Name** | **string** |  | 
 **Description** | Pointer to **string** |  | [optional] 
@@ -16,7 +17,7 @@ Name | Type | Description | Notes
 
 ### NewOtelComponentMapping
 
-`func NewOtelComponentMapping(identifier string, name string, input OtelInput, output OtelComponentMappingOutput, expireAfter int64, ) *OtelComponentMapping`
+`func NewOtelComponentMapping(type_ string, identifier string, name string, input OtelInput, output OtelComponentMappingOutput, expireAfter int64, ) *OtelComponentMapping`
 
 NewOtelComponentMapping instantiates a new OtelComponentMapping object
 This constructor will assign default values to properties that have it defined,
@@ -31,6 +32,26 @@ NewOtelComponentMappingWithDefaults instantiates a new OtelComponentMapping obje
 This constructor will only assign default values to properties that have it defined,
 but it doesn't guarantee that properties required by API are set
 
+### GetType
+
+`func (o *OtelComponentMapping) GetType() string`
+
+GetType returns the Type field if non-nil, zero value otherwise.
+
+### GetTypeOk
+
+`func (o *OtelComponentMapping) GetTypeOk() (*string, bool)`
+
+GetTypeOk returns a tuple with the Type field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetType
+
+`func (o *OtelComponentMapping) SetType(v string)`
+
+SetType sets Type field to given value.
+
+
 ### GetIdentifier
 
 `func (o *OtelComponentMapping) GetIdentifier() string`

generated/stackstate_api/docs/OtelRelationMapping.md

@@ -4,6 +4,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**Type** | **string** |  | 
 **Identifier** | **string** |  | 
 **Name** | **string** |  | 
 **Description** | Pointer to **string** |  | [optional] 
@@ -16,7 +17,7 @@ Name | Type | Description | Notes
 
 ### NewOtelRelationMapping
 
-`func NewOtelRelationMapping(identifier string, name string, input OtelInput, output OtelRelationMappingOutput, expireAfter int64, ) *OtelRelationMapping`
+`func NewOtelRelationMapping(type_ string, identifier string, name string, input OtelInput, output OtelRelationMappingOutput, expireAfter int64, ) *OtelRelationMapping`
 
 NewOtelRelationMapping instantiates a new OtelRelationMapping object
 This constructor will assign default values to properties that have it defined,
@@ -31,6 +32,26 @@ NewOtelRelationMappingWithDefaults instantiates a new OtelRelationMapping object
 This constructor will only assign default values to properties that have it defined,
 but it doesn't guarantee that properties required by API are set
 
+### GetType
+
+`func (o *OtelRelationMapping) GetType() string`
+
+GetType returns the Type field if non-nil, zero value otherwise.
+
+### GetTypeOk
+
+`func (o *OtelRelationMapping) GetTypeOk() (*string, bool)`
+
+GetTypeOk returns a tuple with the Type field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetType
+
+`func (o *OtelRelationMapping) SetType(v string)`
+
+SetType sets Type field to given value.
+
+
 ### GetIdentifier
 
 `func (o *OtelRelationMapping) GetIdentifier() string`

generated/stackstate_api/model_otel_component_mapping.go

@@ -1 +1 @@
-79390474f35f8f3d0599149a2c4c28a168fb39c4
+5bb2b5d01cc20d25322e38d5731875804d31692b