Skip to content

Commit

Permalink
Revert "fix: Remove Machine Policy PollingRequestMaximumMessageProces…
Browse files Browse the repository at this point in the history 
…singTimeout"

This reverts commit e4c3a36.
  • Loading branch information
@IsaacCalligeros95
IsaacCalligeros95 committed Mar 1, 2024
1 parent 9397732 commit c505708
Show file tree
Hide file tree
Showing 5 changed files with 134 additions and 106 deletions.
3 changes: 3 additions & 0 deletions api/octopus_deploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33297,6 +33297,9 @@
"Name": {
"type": "string"
},
"PollingRequestMaximumMessageProcessingTimeout": {
"type": "string"
},
"PollingRequestQueueTimeout": {
"type": "string"
},
Expand Down
4 changes: 4 additions & 0 deletions api/spec.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4964,6 +4964,10 @@
"Name": {
"type": "string"
},
"PollingRequestMaximumMessageProcessingTimeout": {
"format": "date-span",
"type": "string"
},
"PollingRequestQueueTimeout": {
"format": "date-span",
"type": "string"
Expand Down
115 changes: 62 additions & 53 deletions pkg/machinepolicies/machine_policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,55 +10,58 @@ import (
)

type MachinePolicy struct {
ConnectionConnectTimeout time.Duration `json:"ConnectionConnectTimeout" validate:"required,min=10s"`
ConnectionRetryCountLimit int32 `json:"ConnectionRetryCountLimit" validate:"required,gte=2"`
ConnectionRetrySleepInterval time.Duration `json:"ConnectionRetrySleepInterval" validate:"required"`
ConnectionRetryTimeLimit time.Duration `json:"ConnectionRetryTimeLimit" validate:"required,min=10s"`
Description string `json:"Description,omitempty"`
IsDefault bool `json:"IsDefault"`
MachineCleanupPolicy *MachineCleanupPolicy `json:"MachineCleanupPolicy"`
MachineConnectivityPolicy *MachineConnectivityPolicy `json:"MachineConnectivityPolicy"`
MachineHealthCheckPolicy *MachineHealthCheckPolicy `json:"MachineHealthCheckPolicy"`
MachineUpdatePolicy *MachineUpdatePolicy `json:"MachineUpdatePolicy"`
Name string `json:"Name" validate:"required,notblank"`
PollingRequestQueueTimeout time.Duration `json:"PollingRequestQueueTimeout" validate:"required"`
SpaceID string `json:"SpaceId,omitempty"`
ConnectionConnectTimeout time.Duration `json:"ConnectionConnectTimeout" validate:"required,min=10s"`
ConnectionRetryCountLimit int32 `json:"ConnectionRetryCountLimit" validate:"required,gte=2"`
ConnectionRetrySleepInterval time.Duration `json:"ConnectionRetrySleepInterval" validate:"required"`
ConnectionRetryTimeLimit time.Duration `json:"ConnectionRetryTimeLimit" validate:"required,min=10s"`
Description string `json:"Description,omitempty"`
IsDefault bool `json:"IsDefault"`
MachineCleanupPolicy *MachineCleanupPolicy `json:"MachineCleanupPolicy"`
MachineConnectivityPolicy *MachineConnectivityPolicy `json:"MachineConnectivityPolicy"`
MachineHealthCheckPolicy *MachineHealthCheckPolicy `json:"MachineHealthCheckPolicy"`
MachineUpdatePolicy *MachineUpdatePolicy `json:"MachineUpdatePolicy"`
Name string `json:"Name" validate:"required,notblank"`
PollingRequestMaximumMessageProcessingTimeout time.Duration `json:"PollingRequestMaximumMessageProcessingTimeout" validate:"required"`
PollingRequestQueueTimeout time.Duration `json:"PollingRequestQueueTimeout" validate:"required"`
SpaceID string `json:"SpaceId,omitempty"`

resources.Resource
}

func NewMachinePolicy(name string) *MachinePolicy {
return &MachinePolicy{
ConnectionConnectTimeout: time.Minute,
ConnectionRetryCountLimit: 5,
ConnectionRetrySleepInterval: time.Second,
ConnectionRetryTimeLimit: 5 * time.Minute,
MachineCleanupPolicy: NewMachineCleanupPolicy(),
MachineConnectivityPolicy: NewMachineConnectivityPolicy(),
MachineHealthCheckPolicy: NewMachineHealthCheckPolicy(),
MachineUpdatePolicy: NewMachineUpdatePolicy(),
Name: name,
PollingRequestQueueTimeout: 2 * time.Minute,
Resource: *resources.NewResource(),
ConnectionConnectTimeout: time.Minute,
ConnectionRetryCountLimit: 5,
ConnectionRetrySleepInterval: time.Second,
ConnectionRetryTimeLimit: 5 * time.Minute,
MachineCleanupPolicy: NewMachineCleanupPolicy(),
MachineConnectivityPolicy: NewMachineConnectivityPolicy(),
MachineHealthCheckPolicy: NewMachineHealthCheckPolicy(),
MachineUpdatePolicy: NewMachineUpdatePolicy(),
Name: name,
PollingRequestMaximumMessageProcessingTimeout: 10 * time.Minute,
PollingRequestQueueTimeout: 2 * time.Minute,
Resource: *resources.NewResource(),
}
}

// MarshalJSON returns a machine policy as its JSON encoding.
func (m *MachinePolicy) MarshalJSON() ([]byte, error) {
machinePolicy := struct {
ConnectionConnectTimeout string `json:"ConnectionConnectTimeout" validate:"required"`
ConnectionRetryCountLimit int32 `json:"ConnectionRetryCountLimit" validate:"required"`
ConnectionRetrySleepInterval string `json:"ConnectionRetrySleepInterval" validate:"required"`
ConnectionRetryTimeLimit string `json:"ConnectionRetryTimeLimit" validate:"required"`
Description string `json:"Description,omitempty"`
IsDefault bool `json:"IsDefault"`
MachineCleanupPolicy *MachineCleanupPolicy `json:"MachineCleanupPolicy"`
MachineConnectivityPolicy *MachineConnectivityPolicy `json:"MachineConnectivityPolicy"`
MachineHealthCheckPolicy *MachineHealthCheckPolicy `json:"MachineHealthCheckPolicy"`
MachineUpdatePolicy *MachineUpdatePolicy `json:"MachineUpdatePolicy"`
Name string `json:"Name" validate:"required,notblank"`
PollingRequestQueueTimeout string `json:"PollingRequestQueueTimeout" validate:"required"`
SpaceID string `json:"SpaceId,omitempty"`
ConnectionConnectTimeout string `json:"ConnectionConnectTimeout" validate:"required"`
ConnectionRetryCountLimit int32 `json:"ConnectionRetryCountLimit" validate:"required"`
ConnectionRetrySleepInterval string `json:"ConnectionRetrySleepInterval" validate:"required"`
ConnectionRetryTimeLimit string `json:"ConnectionRetryTimeLimit" validate:"required"`
Description string `json:"Description,omitempty"`
IsDefault bool `json:"IsDefault"`
MachineCleanupPolicy *MachineCleanupPolicy `json:"MachineCleanupPolicy"`
MachineConnectivityPolicy *MachineConnectivityPolicy `json:"MachineConnectivityPolicy"`
MachineHealthCheckPolicy *MachineHealthCheckPolicy `json:"MachineHealthCheckPolicy"`
MachineUpdatePolicy *MachineUpdatePolicy `json:"MachineUpdatePolicy"`
Name string `json:"Name" validate:"required,notblank"`
PollingRequestMaximumMessageProcessingTimeout string `json:"PollingRequestMaximumMessageProcessingTimeout" validate:"required"`
PollingRequestQueueTimeout string `json:"PollingRequestQueueTimeout" validate:"required"`
SpaceID string `json:"SpaceId,omitempty"`
resources.Resource
}{
ConnectionConnectTimeout: ToTimeSpan(m.ConnectionConnectTimeout),
Expand All @@ -72,9 +75,10 @@ func (m *MachinePolicy) MarshalJSON() ([]byte, error) {
MachineHealthCheckPolicy: m.MachineHealthCheckPolicy,
MachineUpdatePolicy: m.MachineUpdatePolicy,
Name: m.Name,
PollingRequestQueueTimeout: ToTimeSpan(m.PollingRequestQueueTimeout),
SpaceID: m.SpaceID,
Resource: m.Resource,
PollingRequestMaximumMessageProcessingTimeout: ToTimeSpan(m.PollingRequestMaximumMessageProcessingTimeout),
PollingRequestQueueTimeout: ToTimeSpan(m.PollingRequestQueueTimeout),
SpaceID: m.SpaceID,
Resource: m.Resource,
}

return json.Marshal(machinePolicy)
Expand All @@ -83,19 +87,20 @@ func (m *MachinePolicy) MarshalJSON() ([]byte, error) {
// UnmarshalJSON sets this Kubernetes endpoint to its representation in JSON.
func (m *MachinePolicy) UnmarshalJSON(data []byte) error {
var fields struct {
ConnectionConnectTimeout string `json:"ConnectionConnectTimeout" validate:"required"`
ConnectionRetryCountLimit int32 `json:"ConnectionRetryCountLimit" validate:"required"`
ConnectionRetrySleepInterval string `json:"ConnectionRetrySleepInterval" validate:"required"`
ConnectionRetryTimeLimit string `json:"ConnectionRetryTimeLimit" validate:"required"`
Description string `json:"Description,omitempty"`
IsDefault bool `json:"IsDefault"`
MachineCleanupPolicy *MachineCleanupPolicy `json:"MachineCleanupPolicy"`
MachineConnectivityPolicy *MachineConnectivityPolicy `json:"MachineConnectivityPolicy"`
MachineHealthCheckPolicy *MachineHealthCheckPolicy `json:"MachineHealthCheckPolicy"`
MachineUpdatePolicy *MachineUpdatePolicy `json:"MachineUpdatePolicy"`
Name string `json:"Name"`
PollingRequestQueueTimeout string `json:"PollingRequestQueueTimeout" validate:"required"`
SpaceID string `json:"SpaceId,omitempty"`
ConnectionConnectTimeout string `json:"ConnectionConnectTimeout" validate:"required"`
ConnectionRetryCountLimit int32 `json:"ConnectionRetryCountLimit" validate:"required"`
ConnectionRetrySleepInterval string `json:"ConnectionRetrySleepInterval" validate:"required"`
ConnectionRetryTimeLimit string `json:"ConnectionRetryTimeLimit" validate:"required"`
Description string `json:"Description,omitempty"`
IsDefault bool `json:"IsDefault"`
MachineCleanupPolicy *MachineCleanupPolicy `json:"MachineCleanupPolicy"`
MachineConnectivityPolicy *MachineConnectivityPolicy `json:"MachineConnectivityPolicy"`
MachineHealthCheckPolicy *MachineHealthCheckPolicy `json:"MachineHealthCheckPolicy"`
MachineUpdatePolicy *MachineUpdatePolicy `json:"MachineUpdatePolicy"`
Name string `json:"Name"`
PollingRequestMaximumMessageProcessingTimeout string `json:"PollingRequestMaximumMessageProcessingTimeout" validate:"required"`
PollingRequestQueueTimeout string `json:"PollingRequestQueueTimeout" validate:"required"`
SpaceID string `json:"SpaceId,omitempty"`
resources.Resource
}
err := json.Unmarshal(data, &fields)
Expand Down Expand Up @@ -126,6 +131,10 @@ func (m *MachinePolicy) UnmarshalJSON(data []byte) error {
m.ConnectionRetryTimeLimit = FromTimeSpan(fields.ConnectionRetryTimeLimit)
}

if len(fields.PollingRequestMaximumMessageProcessingTimeout) > 0 {
m.PollingRequestMaximumMessageProcessingTimeout = FromTimeSpan(fields.PollingRequestMaximumMessageProcessingTimeout)
}

if len(fields.PollingRequestQueueTimeout) > 0 {
m.PollingRequestQueueTimeout = FromTimeSpan(fields.PollingRequestQueueTimeout)
}
Expand Down

0 comments on commit c505708

Please sign in to comment.