Skip to content
This repository was archived by the owner on Jun 11, 2025. It is now read-only.

Update/publish nats #289

Merged
abdheshnayak merged 4 commits into from
Mar 5, 2024
Merged

Update/publish nats #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b8afb1
remove resource type hardcoaded
nxtcoder19 Mar 5, 2024
1232a2b
:bug: Fixed issue with socket server
abdheshnayak Mar 5, 2024
0f8b1ce
:art: Remove omitempty from app_type(hpa.enabled)
abdheshnayak Mar 5, 2024
577d727
Merge pull request #288 from kloudlite/improve/app_type
abdheshnayak Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/console/internal/app/adapter-resource-update-publish.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func (r *ResourceEventPublisherImpl) PublishProjectResourceEvent(ctx domain.Cons
}

func (r *ResourceEventPublisherImpl) PublishConsoleEvent(ctx domain.ConsoleContext, resourceType entities.ResourceType, name string, update domain.PublishMsg) {
subject := fmt.Sprintf("res-updates.account.%s.resourceType.%s.%s", ctx.AccountName, resourceType, name)
subject := fmt.Sprintf("res-updates.account.%s.%s.%s", ctx.AccountName, resourceType, name)
r.publish(subject, update)
}

Expand Down
103 changes: 96 additions & 7 deletions apps/console/internal/app/graph/generated/generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions apps/console/internal/app/graph/model/models_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions apps/console/internal/app/graph/secret.resolvers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apps/console/internal/app/graph/struct-to-graphql/common-types.graphqls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ type Github__com___kloudlite___operator___apis___crds___v1__EnvironmentSpec @sha
}

type Github__com___kloudlite___operator___apis___crds___v1__HPA @shareable {
enabled: Boolean
enabled: Boolean!
maxReplicas: Int
minReplicas: Int
thresholdCpu: Int
Expand Down Expand Up @@ -379,7 +379,7 @@ input Github__com___kloudlite___operator___apis___crds___v1__EnvironmentSpecIn {
}

input Github__com___kloudlite___operator___apis___crds___v1__HPAIn {
enabled: Boolean
enabled: Boolean!
maxReplicas: Int
minReplicas: Int
thresholdCpu: Int
Expand Down
1 change: 1 addition & 0 deletions apps/console/internal/app/graph/struct-to-graphql/secret.graphqls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ type Secret @shareable {
environmentName: String!
id: String!
immutable: Boolean
isReadyOnly: Boolean!
kind: String
lastUpdatedBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy!
markedForDeletion: Boolean
Expand Down
5 changes: 2 additions & 3 deletions apps/container-registry/internal/app/adapter-resource-update-publish.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@ func clusterBuildRunUpdateSubject(buildRun *entities.BuildRun) string {
}

func clusterBuildCacheUpdateSubject(buildCache *entities.BuildCacheKey) string {
return fmt.Sprintf("res-updates.account.%s.displayName.%s.name.%s",
Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot Mar 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion (llm): The change in the format of the NATS subject for build cache updates removes displayName and name, relying solely on id. It's important to verify through integration tests that subscribers to these subjects (if any exist) correctly handle and process messages with the new subject format. This ensures that the system's overall functionality remains intact.

return fmt.Sprintf("res-updates.account.%s.id.%s",
buildCache.AccountName,
buildCache.DisplayName,
buildCache.Name,
buildCache.Id,
)
}
2 changes: 1 addition & 1 deletion apps/infra/internal/app/adapter-resource-update-publish.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type ResourceEventPublisherImpl struct {

func (r *ResourceEventPublisherImpl) PublishInfraEvent(ctx domain.InfraContext, resourceType domain.ResourceType, resName string, update domain.PublishMsg) {
subject := fmt.Sprintf(
"res-updates.account.%s.resourceType.%s.%s",
"res-updates.account.%s.%s.%s",
ctx.AccountName, resourceType, resName,
)

Expand Down
3 changes: 2 additions & 1 deletion apps/websocket-server/internal/domain/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ func (d *domain) HandleWebSocket(ctx context.Context, c *websocket.Conn) error {
Context: ctx,
Session: sess,
// Connection: c,
Mutex: &mu,
Mutex: &mu,
WriteJSON: write,
}

for {
Expand Down
2 changes: 1 addition & 1 deletion apps/websocket-server/internal/domain/resource_watch/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type ReqData struct {
ReqTopic string `json:"req_topic"`
}

type Response struct{
type Response struct {
}

func ParseReq(rt string) (*ReqData, error) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ require (

require (
github.com/kloudlite/container-registry-authorizer v0.0.0-20231021122509-161dc30fde55
github.com/kloudlite/operator v1.0.4-0.20240304120205-71b62093a405
github.com/kloudlite/operator v1.0.4-0.20240305112630-9048b76e9997
github.com/nats-io/nats.go v1.31.0
github.com/onsi/ginkgo/v2 v2.12.0
github.com/onsi/gomega v1.27.10
Expand Down
18 changes: 2 additions & 16 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,22 +162,8 @@ github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJw
github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
github.com/kloudlite/container-registry-authorizer v0.0.0-20231021122509-161dc30fde55 h1:YnZh3TL6AG4EfoInx1/L5zcPHd2QxgLKseJB1KtHjdQ=
github.com/kloudlite/container-registry-authorizer v0.0.0-20231021122509-161dc30fde55/go.mod h1:GZj3wZmIw/qCciclRhgQTgmGiqe8wxoVzMXQjbOfnbc=
github.com/kloudlite/operator v0.0.0-20240116073010-358659b6c673 h1:t3e61wr+c2jUzsNmAJx1aPsev5L+yL1rOtIj1KNZ9g0=
github.com/kloudlite/operator v0.0.0-20240116073010-358659b6c673/go.mod h1:eD8xKzwOVtajAglELcEHn2XL4H22ERBLT2uaisA6SzQ=
github.com/kloudlite/operator v0.0.0-20240124071634-f1e66969c02c h1:oo6k+eLZ8EULnjLtO0iGTLrw9pcBfWhqYnB8dGBaSvE=
github.com/kloudlite/operator v0.0.0-20240124071634-f1e66969c02c/go.mod h1:eD8xKzwOVtajAglELcEHn2XL4H22ERBLT2uaisA6SzQ=
github.com/kloudlite/operator v0.0.0-20240125192852-5c63464fe989 h1:mHshQnMCWiqpHwYn87ARpYRVyN57q0ksOKCM4wXmeHc=
github.com/kloudlite/operator v0.0.0-20240125192852-5c63464fe989/go.mod h1:eD8xKzwOVtajAglELcEHn2XL4H22ERBLT2uaisA6SzQ=
github.com/kloudlite/operator v1.0.3-0.20240214140630-cabaf59fe3d4 h1:bpYACb4+ayPc9FQ4kjBLJP6O6uxIW3kLF2tJQXHAnG8=
github.com/kloudlite/operator v1.0.3-0.20240214140630-cabaf59fe3d4/go.mod h1:eD8xKzwOVtajAglELcEHn2XL4H22ERBLT2uaisA6SzQ=
github.com/kloudlite/operator v1.0.4-0.20240222110024-40f5cdf20fd5 h1:4MpUX5eGryD03gMG4XuzdvfsTjSSUtJhTI4OR+vE2q0=
github.com/kloudlite/operator v1.0.4-0.20240222110024-40f5cdf20fd5/go.mod h1:kMXogvCB4qSG56WlJ5lhyL6JVeVLJ+IyyE18g/1FF1I=
github.com/kloudlite/operator v1.0.4-0.20240301102315-eaaca2bf5858 h1:9xwI6Kg3nyUfbElzjb/XMM7PM1O5aVlde+4Ftcs7ZtM=
github.com/kloudlite/operator v1.0.4-0.20240301102315-eaaca2bf5858/go.mod h1:kMXogvCB4qSG56WlJ5lhyL6JVeVLJ+IyyE18g/1FF1I=
github.com/kloudlite/operator v1.0.4-0.20240302150206-a2acd5f489a9 h1:53uXx3WcoxUDr+niHvABk/0Wgo6i5AvjG93Mhs5RCjw=
github.com/kloudlite/operator v1.0.4-0.20240302150206-a2acd5f489a9/go.mod h1:kMXogvCB4qSG56WlJ5lhyL6JVeVLJ+IyyE18g/1FF1I=
github.com/kloudlite/operator v1.0.4-0.20240304120205-71b62093a405 h1:JOLs3M3kx3xRjQkCpEIkh2I+qfUd2HRVYZ1g7saw3Nk=
github.com/kloudlite/operator v1.0.4-0.20240304120205-71b62093a405/go.mod h1:kMXogvCB4qSG56WlJ5lhyL6JVeVLJ+IyyE18g/1FF1I=
github.com/kloudlite/operator v1.0.4-0.20240305112630-9048b76e9997 h1:O2+MX8Fah90KzFLly7gf25CD1Euob3WIz14mBHWLjCM=
github.com/kloudlite/operator v1.0.4-0.20240305112630-9048b76e9997/go.mod h1:kMXogvCB4qSG56WlJ5lhyL6JVeVLJ+IyyE18g/1FF1I=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
Expand Down