From 68c1e795a4b37d7c4f75e9614dcd4849788382fb Mon Sep 17 00:00:00 2001 From: Zipofar Date: Tue, 21 Feb 2023 17:27:25 +0300 Subject: [PATCH 1/2] [796] FIX: Containers status is not updated when a new commit is being built --- internal/domain_logic/network_connectivity/templates.go | 7 +++++-- internal/types/domain/container.go | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/domain_logic/network_connectivity/templates.go b/internal/domain_logic/network_connectivity/templates.go index f132fff7..d3e77a9a 100644 --- a/internal/domain_logic/network_connectivity/templates.go +++ b/internal/domain_logic/network_connectivity/templates.go @@ -18,6 +18,7 @@ type ConnectivityContainerStatus struct { DomainName string `json:"domain_name,omitempty"` Port int `json:"port"` Status ConnectivityStatus `json:"status"` + ApplyAt uint64 `json:"apply_at"` } type ConnectivityContainer struct { @@ -56,6 +57,7 @@ func NewNetworkConnectivityTemplate(containerList domainTypes.ContainerList) (*C DomainName: domainName, Port: containerPort, Status: StatusPending, + ApplyAt: container.ApplyAt, }, } @@ -69,8 +71,9 @@ func (response *ConnectivityResponse) AddIngressContainer(container *domainTypes containerID := fmt.Sprint(container.ID) networkConnectivityContainer := response.Containers[containerID] networkConnectivityContainer.Ingress = &ConnectivityContainerStatus{ - Port: global.Settings.IngressDefaultPort, - Status: StatusPending, + Port: global.Settings.IngressDefaultPort, + Status: StatusPending, + ApplyAt: container.ApplyAt, } response.Containers[containerID] = networkConnectivityContainer diff --git a/internal/types/domain/container.go b/internal/types/domain/container.go index f6d35723..ec594066 100644 --- a/internal/types/domain/container.go +++ b/internal/types/domain/container.go @@ -30,6 +30,7 @@ type Container struct { ServiceName string `json:"service_name"` AdditionalSubdomains []string `json:"additional_subdomains"` ContainerHostVolumeFiles []*ContainerHostVolumeFile `json:"container_host_volume_files"` + ApplyAt uint64 `json:"apply_at"` } func (c Container) IsPublic() bool { From 85de29b37fd1bc31630687d9e6625ed908b21096 Mon Sep 17 00:00:00 2001 From: Zipofar Date: Mon, 27 Feb 2023 19:43:15 +0300 Subject: [PATCH 2/2] [796] refactor --- internal/domain_logic/network_connectivity/templates.go | 6 +++--- internal/types/domain/container.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/domain_logic/network_connectivity/templates.go b/internal/domain_logic/network_connectivity/templates.go index d3e77a9a..4bf4122a 100644 --- a/internal/domain_logic/network_connectivity/templates.go +++ b/internal/domain_logic/network_connectivity/templates.go @@ -18,7 +18,7 @@ type ConnectivityContainerStatus struct { DomainName string `json:"domain_name,omitempty"` Port int `json:"port"` Status ConnectivityStatus `json:"status"` - ApplyAt uint64 `json:"apply_at"` + Version string `json:"version"` } type ConnectivityContainer struct { @@ -57,7 +57,7 @@ func NewNetworkConnectivityTemplate(containerList domainTypes.ContainerList) (*C DomainName: domainName, Port: containerPort, Status: StatusPending, - ApplyAt: container.ApplyAt, + Version: container.Version, }, } @@ -73,7 +73,7 @@ func (response *ConnectivityResponse) AddIngressContainer(container *domainTypes networkConnectivityContainer.Ingress = &ConnectivityContainerStatus{ Port: global.Settings.IngressDefaultPort, Status: StatusPending, - ApplyAt: container.ApplyAt, + Version: container.Version, } response.Containers[containerID] = networkConnectivityContainer diff --git a/internal/types/domain/container.go b/internal/types/domain/container.go index ec594066..68ff0d2c 100644 --- a/internal/types/domain/container.go +++ b/internal/types/domain/container.go @@ -30,7 +30,7 @@ type Container struct { ServiceName string `json:"service_name"` AdditionalSubdomains []string `json:"additional_subdomains"` ContainerHostVolumeFiles []*ContainerHostVolumeFile `json:"container_host_volume_files"` - ApplyAt uint64 `json:"apply_at"` + Version string `json:"version"` } func (c Container) IsPublic() bool {