Skip to content

Commit

Permalink
Merge branch 'main' into feat/update-service-level-model
Browse files Browse the repository at this point in the history
  • Loading branch information
mbazhlekova authored Sep 26, 2022
2 parents c240241 + f0faf24 commit 46406ea
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 9 deletions.
12 changes: 12 additions & 0 deletions .tutone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,18 @@ packages:
field_type_override: "*WorkloadScopeAccountsInput"
- name: WorkloadUpdateStatusConfigInput
field_type_override: "*WorkloadUpdateStatusConfigInput"
#status config overrides
- name: WorkloadAutomaticStatusInput
field_type_override: "*WorkloadAutomaticStatusInput"
- name: WorkloadUpdateAutomaticStatusInput
field_type_override: "*WorkloadUpdateAutomaticStatusInput"
- name: WorkloadRemainingEntitiesRuleInput
field_type_override: "*WorkloadRemainingEntitiesRuleInput"
- name: WorkloadRemainingEntitiesRuleRollupInput
field_type_override: "*WorkloadRemainingEntitiesRuleRollupInput"
- name: WorkloadRollupInput
field_type_override: "*WorkloadRollupInput"
- name: WorkloadRuleThresholdType

#
# Types owned by other packages
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<a name="v0.91.3"></a>
## [v0.91.3] - 2022-09-26
### Bug Fixes
- make some workloads types nullable

<a name="v0.91.2"></a>
## [v0.91.2] - 2022-09-22
### Bug Fixes
Expand Down Expand Up @@ -1428,7 +1433,8 @@
- extract paging implementation
- rename packages for clarity, promote Config to the public package

[Unreleased]: https://github.com/newrelic/newrelic-client-go/compare/v0.91.2...HEAD
[Unreleased]: https://github.com/newrelic/newrelic-client-go/compare/v0.91.3...HEAD
[v0.91.3]: https://github.com/newrelic/newrelic-client-go/compare/v0.91.2...v0.91.3
[v0.91.2]: https://github.com/newrelic/newrelic-client-go/compare/v0.91.1...v0.91.2
[v0.91.1]: https://github.com/newrelic/newrelic-client-go/compare/v0.91.0...v0.91.1
[v0.91.0]: https://github.com/newrelic/newrelic-client-go/compare/v0.90.0...v0.91.0
Expand Down
2 changes: 1 addition & 1 deletion internal/version/version.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package version

// Version of this library
const Version string = "0.91.2"
const Version string = "0.91.3"
14 changes: 7 additions & 7 deletions pkg/workloads/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ type WorkloadAutomaticStatusInput struct {
// Whether the automatic status configuration is enabled or not.
Enabled bool `json:"enabled"`
// An additional meta-rule that can consider all entities that haven't been evaluated by any other rule.
RemainingEntitiesRule WorkloadRemainingEntitiesRuleInput `json:"remainingEntitiesRule,omitempty"`
RemainingEntitiesRule *WorkloadRemainingEntitiesRuleInput `json:"remainingEntitiesRule,omitempty"`
// A list of rules.
Rules []WorkloadRegularRuleInput `json:"rules,omitempty"`
}
Expand Down Expand Up @@ -259,7 +259,7 @@ type WorkloadRegularRuleInput struct {
// A list of entity search queries used to retrieve the entities that compose the rule.
EntitySearchQueries []WorkloadEntitySearchQueryInput `json:"entitySearchQueries,omitempty"`
// The input object used to represent a rollup strategy.
Rollup WorkloadRollupInput `json:"rollup,omitempty"`
Rollup *WorkloadRollupInput `json:"rollup,omitempty"`
}

// WorkloadRemainingEntitiesRule - The definition of a remaining entities rule.
Expand All @@ -271,7 +271,7 @@ type WorkloadRemainingEntitiesRule struct {
// WorkloadRemainingEntitiesRuleInput - The input object used to represent a remaining entities rule.
type WorkloadRemainingEntitiesRuleInput struct {
// The input object used to represent a rollup strategy.
Rollup WorkloadRemainingEntitiesRuleRollupInput `json:"rollup,omitempty"`
Rollup *WorkloadRemainingEntitiesRuleRollupInput `json:"rollup,omitempty"`
}

// WorkloadRemainingEntitiesRuleRollup - The rollup strategy.
Expand Down Expand Up @@ -411,7 +411,7 @@ type WorkloadStatusConfig struct {
// WorkloadStatusConfigInput - The input object used to provide the configuration that defines how the status of the workload is calculated.
type WorkloadStatusConfigInput struct {
// An input object used to represent an automatic status configuration.
Automatic WorkloadAutomaticStatusInput `json:"automatic,omitempty"`
Automatic *WorkloadAutomaticStatusInput `json:"automatic,omitempty"`
// A list of static status configurations. You can only configure one static status for a workload.
Static []WorkloadStaticStatusInput `json:"static,omitempty"`
}
Expand All @@ -431,7 +431,7 @@ type WorkloadUpdateAutomaticStatusInput struct {
// Whether the automatic status configuration is enabled or not.
Enabled bool `json:"enabled"`
// An additional meta-rule that can consider all entities that haven't been evaluated by any other rule.
RemainingEntitiesRule WorkloadRemainingEntitiesRuleInput `json:"remainingEntitiesRule,omitempty"`
RemainingEntitiesRule *WorkloadRemainingEntitiesRuleInput `json:"remainingEntitiesRule,omitempty"`
// A list of rules.
Rules []WorkloadUpdateRegularRuleInput `json:"rules,omitempty"`
}
Expand Down Expand Up @@ -469,7 +469,7 @@ type WorkloadUpdateRegularRuleInput struct {
// The unique identifier of the rule to be updated. If not provided, a new rule is created.
ID int `json:"id,omitempty"`
// The input object used to represent a roll-up strategy.
Rollup WorkloadRollupInput `json:"rollup,omitempty"`
Rollup *WorkloadRollupInput `json:"rollup,omitempty"`
}

// WorkloadUpdateStaticStatusInput - The input object used to represent the configuration of a static status.
Expand All @@ -489,7 +489,7 @@ type WorkloadUpdateStaticStatusInput struct {
// WorkloadUpdateStatusConfigInput - The input object used to provide the configuration that defines how the status of the workload is calculated.
type WorkloadUpdateStatusConfigInput struct {
// An input object used to represent an automatic status configuration.
Automatic WorkloadUpdateAutomaticStatusInput `json:"automatic,omitempty"`
Automatic *WorkloadUpdateAutomaticStatusInput `json:"automatic,omitempty"`
// A list of static status configurations. You can only configure one static status for a workload.
Static []WorkloadUpdateStaticStatusInput `json:"static,omitempty"`
}
Expand Down

0 comments on commit 46406ea

Please sign in to comment.