This is an automated email from the ASF dual-hosted git repository. DImuthuUpe pushed a commit to branch usage-monitor in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
commit 80ec1b9c4eb3781a9e7093334d7f4304d1fa7950 Author: DImuthuUpe <[email protected]> AuthorDate: Mon May 25 20:53:41 2026 -0400 Moved slurm client to higher level module --- connectors/SLURM/Association-Mapper/README.md | 8 +++++--- .../SLURM/Association-Mapper/internal/subscribers/account.go | 2 +- .../internal/subscribers/accountsub_integration_test.go | 2 +- .../SLURM/Association-Mapper/internal/subscribers/members.go | 2 +- .../internal/subscribers/members_integration_test.go | 2 +- .../SLURM/Association-Mapper/internal/subscribers/subscriber.go | 2 +- connectors/SLURM/Association-Mapper/pkg/smapper/loader.go | 2 +- .../internal/operations => Rest-Client/pkg/client}/accounts.go | 2 +- .../pkg/client}/accounts_integration_test.go | 2 +- .../operations => Rest-Client/pkg/client}/accounts_test.go | 2 +- .../operations => Rest-Client/pkg/client}/associations.go | 2 +- .../pkg/client}/associations_integration_test.go | 2 +- .../operations => Rest-Client/pkg/client}/associations_test.go | 2 +- .../internal/operations => Rest-Client/pkg/client}/client.go | 2 +- .../internal/operations => Rest-Client/pkg/client}/client_test.go | 2 +- .../operations => Rest-Client/pkg/client}/integration_common.go | 2 +- .../internal/operations => Rest-Client/pkg/client}/tres.go | 2 +- .../internal/operations => Rest-Client/pkg/client}/tres_test.go | 2 +- .../internal/operations => Rest-Client/pkg/client}/types.go | 2 +- 19 files changed, 23 insertions(+), 21 deletions(-) diff --git a/connectors/SLURM/Association-Mapper/README.md b/connectors/SLURM/Association-Mapper/README.md index 2dff57ba3..ff32c411f 100644 --- a/connectors/SLURM/Association-Mapper/README.md +++ b/connectors/SLURM/Association-Mapper/README.md @@ -13,11 +13,13 @@ This package is part of the root `github.com/apache/airavata-custos` module. ``` . -├── internal/operations/ # slurmrestd client + accounts/associations/TRES -└── pkg/operations/ +├── internal/subscribers/ # event subscribers wiring core events to slurmrestd +└── pkg/smapper/ # connector loader ``` -Import path: `github.com/apache/airavata-custos/connectors/SLURM/Association-Mapper/internal/operations`. +The slurmrestd client lives in the sibling Rest-Client module at `connectors/SLURM/Rest-Client/pkg/client`. + +Import path: `github.com/apache/airavata-custos/connectors/SLURM/Rest-Client/pkg/client`. ## Configuration diff --git a/connectors/SLURM/Association-Mapper/internal/subscribers/account.go b/connectors/SLURM/Association-Mapper/internal/subscribers/account.go index fb7f69f57..4e132aa8c 100644 --- a/connectors/SLURM/Association-Mapper/internal/subscribers/account.go +++ b/connectors/SLURM/Association-Mapper/internal/subscribers/account.go @@ -6,7 +6,7 @@ import ( "context" "time" - client "github.com/apache/airavata-custos/connectors/SLURM/Association-Mapper/internal/operations" + "github.com/apache/airavata-custos/connectors/SLURM/Rest-Client/pkg/client" "github.com/apache/airavata-custos/pkg/models" ) diff --git a/connectors/SLURM/Association-Mapper/internal/subscribers/accountsub_integration_test.go b/connectors/SLURM/Association-Mapper/internal/subscribers/accountsub_integration_test.go index 867f5ff29..4c701f456 100644 --- a/connectors/SLURM/Association-Mapper/internal/subscribers/accountsub_integration_test.go +++ b/connectors/SLURM/Association-Mapper/internal/subscribers/accountsub_integration_test.go @@ -3,7 +3,7 @@ package subscribers import ( "context" "fmt" - operations "github.com/apache/airavata-custos/connectors/SLURM/Association-Mapper/internal/operations" + operations "github.com/apache/airavata-custos/connectors/SLURM/Rest-Client/pkg/client" "github.com/apache/airavata-custos/pkg/models" "github.com/apache/airavata-custos/pkg/service" "os" diff --git a/connectors/SLURM/Association-Mapper/internal/subscribers/members.go b/connectors/SLURM/Association-Mapper/internal/subscribers/members.go index 1d8b294fd..e3fa20e36 100644 --- a/connectors/SLURM/Association-Mapper/internal/subscribers/members.go +++ b/connectors/SLURM/Association-Mapper/internal/subscribers/members.go @@ -6,7 +6,7 @@ import ( "context" "time" - client "github.com/apache/airavata-custos/connectors/SLURM/Association-Mapper/internal/operations" + "github.com/apache/airavata-custos/connectors/SLURM/Rest-Client/pkg/client" "github.com/apache/airavata-custos/pkg/models" ) diff --git a/connectors/SLURM/Association-Mapper/internal/subscribers/members_integration_test.go b/connectors/SLURM/Association-Mapper/internal/subscribers/members_integration_test.go index 3bd90837d..b90a6152f 100644 --- a/connectors/SLURM/Association-Mapper/internal/subscribers/members_integration_test.go +++ b/connectors/SLURM/Association-Mapper/internal/subscribers/members_integration_test.go @@ -2,7 +2,7 @@ package subscribers import ( "context" - "github.com/apache/airavata-custos/connectors/SLURM/Association-Mapper/internal/operations" + operations "github.com/apache/airavata-custos/connectors/SLURM/Rest-Client/pkg/client" "github.com/apache/airavata-custos/pkg/models" "github.com/apache/airavata-custos/pkg/service" "os" diff --git a/connectors/SLURM/Association-Mapper/internal/subscribers/subscriber.go b/connectors/SLURM/Association-Mapper/internal/subscribers/subscriber.go index 3a2fa5161..71070714f 100644 --- a/connectors/SLURM/Association-Mapper/internal/subscribers/subscriber.go +++ b/connectors/SLURM/Association-Mapper/internal/subscribers/subscriber.go @@ -4,7 +4,7 @@ import ( "context" "time" - client "github.com/apache/airavata-custos/connectors/SLURM/Association-Mapper/internal/operations" + "github.com/apache/airavata-custos/connectors/SLURM/Rest-Client/pkg/client" "github.com/apache/airavata-custos/pkg/events" "github.com/apache/airavata-custos/pkg/models" "github.com/apache/airavata-custos/pkg/service" diff --git a/connectors/SLURM/Association-Mapper/pkg/smapper/loader.go b/connectors/SLURM/Association-Mapper/pkg/smapper/loader.go index 9eee2ae74..9eee18aef 100644 --- a/connectors/SLURM/Association-Mapper/pkg/smapper/loader.go +++ b/connectors/SLURM/Association-Mapper/pkg/smapper/loader.go @@ -8,7 +8,7 @@ import ( "github.com/jmoiron/sqlx" - client "github.com/apache/airavata-custos/connectors/SLURM/Association-Mapper/internal/operations" + "github.com/apache/airavata-custos/connectors/SLURM/Rest-Client/pkg/client" "github.com/apache/airavata-custos/connectors/SLURM/Association-Mapper/internal/subscribers" "github.com/apache/airavata-custos/pkg/events" "github.com/apache/airavata-custos/pkg/service" diff --git a/connectors/SLURM/Association-Mapper/internal/operations/accounts.go b/connectors/SLURM/Rest-Client/pkg/client/accounts.go similarity index 98% rename from connectors/SLURM/Association-Mapper/internal/operations/accounts.go rename to connectors/SLURM/Rest-Client/pkg/client/accounts.go index 18cc0e456..c58a26fc1 100644 --- a/connectors/SLURM/Association-Mapper/internal/operations/accounts.go +++ b/connectors/SLURM/Rest-Client/pkg/client/accounts.go @@ -1,5 +1,5 @@ // cli/internal/client/accounts.go -package operations +package client import "fmt" diff --git a/connectors/SLURM/Association-Mapper/internal/operations/accounts_integration_test.go b/connectors/SLURM/Rest-Client/pkg/client/accounts_integration_test.go similarity index 99% rename from connectors/SLURM/Association-Mapper/internal/operations/accounts_integration_test.go rename to connectors/SLURM/Rest-Client/pkg/client/accounts_integration_test.go index 5a1a41df8..e20228bcb 100644 --- a/connectors/SLURM/Association-Mapper/internal/operations/accounts_integration_test.go +++ b/connectors/SLURM/Rest-Client/pkg/client/accounts_integration_test.go @@ -1,4 +1,4 @@ -package operations +package client import ( "os" diff --git a/connectors/SLURM/Association-Mapper/internal/operations/accounts_test.go b/connectors/SLURM/Rest-Client/pkg/client/accounts_test.go similarity index 99% rename from connectors/SLURM/Association-Mapper/internal/operations/accounts_test.go rename to connectors/SLURM/Rest-Client/pkg/client/accounts_test.go index aaeae99df..bdf5c4f5c 100644 --- a/connectors/SLURM/Association-Mapper/internal/operations/accounts_test.go +++ b/connectors/SLURM/Rest-Client/pkg/client/accounts_test.go @@ -1,5 +1,5 @@ // cli/internal/client/accounts_test.go -package operations +package client import ( "encoding/json" diff --git a/connectors/SLURM/Association-Mapper/internal/operations/associations.go b/connectors/SLURM/Rest-Client/pkg/client/associations.go similarity index 99% rename from connectors/SLURM/Association-Mapper/internal/operations/associations.go rename to connectors/SLURM/Rest-Client/pkg/client/associations.go index 1ecf66033..6579944d9 100644 --- a/connectors/SLURM/Association-Mapper/internal/operations/associations.go +++ b/connectors/SLURM/Rest-Client/pkg/client/associations.go @@ -1,5 +1,5 @@ // cli/internal/client/associations.go -package operations +package client import ( "errors" diff --git a/connectors/SLURM/Association-Mapper/internal/operations/associations_integration_test.go b/connectors/SLURM/Rest-Client/pkg/client/associations_integration_test.go similarity index 99% rename from connectors/SLURM/Association-Mapper/internal/operations/associations_integration_test.go rename to connectors/SLURM/Rest-Client/pkg/client/associations_integration_test.go index bfe296297..7ec08e88d 100644 --- a/connectors/SLURM/Association-Mapper/internal/operations/associations_integration_test.go +++ b/connectors/SLURM/Rest-Client/pkg/client/associations_integration_test.go @@ -1,4 +1,4 @@ -package operations +package client import ( "os" diff --git a/connectors/SLURM/Association-Mapper/internal/operations/associations_test.go b/connectors/SLURM/Rest-Client/pkg/client/associations_test.go similarity index 99% rename from connectors/SLURM/Association-Mapper/internal/operations/associations_test.go rename to connectors/SLURM/Rest-Client/pkg/client/associations_test.go index 9f394eed4..dac380c88 100644 --- a/connectors/SLURM/Association-Mapper/internal/operations/associations_test.go +++ b/connectors/SLURM/Rest-Client/pkg/client/associations_test.go @@ -1,5 +1,5 @@ // cli/internal/client/associations_test.go -package operations +package client import ( "encoding/json" diff --git a/connectors/SLURM/Association-Mapper/internal/operations/client.go b/connectors/SLURM/Rest-Client/pkg/client/client.go similarity index 98% rename from connectors/SLURM/Association-Mapper/internal/operations/client.go rename to connectors/SLURM/Rest-Client/pkg/client/client.go index a60ab883a..6886db8ab 100644 --- a/connectors/SLURM/Association-Mapper/internal/operations/client.go +++ b/connectors/SLURM/Rest-Client/pkg/client/client.go @@ -1,5 +1,5 @@ // cli/internal/client/client.go -package operations +package client import ( "bytes" diff --git a/connectors/SLURM/Association-Mapper/internal/operations/client_test.go b/connectors/SLURM/Rest-Client/pkg/client/client_test.go similarity index 98% rename from connectors/SLURM/Association-Mapper/internal/operations/client_test.go rename to connectors/SLURM/Rest-Client/pkg/client/client_test.go index c73d3ecb5..22f4b3fbe 100644 --- a/connectors/SLURM/Association-Mapper/internal/operations/client_test.go +++ b/connectors/SLURM/Rest-Client/pkg/client/client_test.go @@ -1,5 +1,5 @@ // cli/internal/client/client_test.go -package operations +package client import ( "net/http" diff --git a/connectors/SLURM/Association-Mapper/internal/operations/integration_common.go b/connectors/SLURM/Rest-Client/pkg/client/integration_common.go similarity index 97% rename from connectors/SLURM/Association-Mapper/internal/operations/integration_common.go rename to connectors/SLURM/Rest-Client/pkg/client/integration_common.go index 6bcd8bc96..ec799ddb6 100644 --- a/connectors/SLURM/Association-Mapper/internal/operations/integration_common.go +++ b/connectors/SLURM/Rest-Client/pkg/client/integration_common.go @@ -1,4 +1,4 @@ -package operations +package client import "os" import "testing" diff --git a/connectors/SLURM/Association-Mapper/internal/operations/tres.go b/connectors/SLURM/Rest-Client/pkg/client/tres.go similarity index 97% rename from connectors/SLURM/Association-Mapper/internal/operations/tres.go rename to connectors/SLURM/Rest-Client/pkg/client/tres.go index 313c58c59..aaad5fcf1 100644 --- a/connectors/SLURM/Association-Mapper/internal/operations/tres.go +++ b/connectors/SLURM/Rest-Client/pkg/client/tres.go @@ -1,5 +1,5 @@ // cli/internal/client/tres.go -package operations +package client import ( "fmt" diff --git a/connectors/SLURM/Association-Mapper/internal/operations/tres_test.go b/connectors/SLURM/Rest-Client/pkg/client/tres_test.go similarity index 97% rename from connectors/SLURM/Association-Mapper/internal/operations/tres_test.go rename to connectors/SLURM/Rest-Client/pkg/client/tres_test.go index 79ba50faf..43b6c29f4 100644 --- a/connectors/SLURM/Association-Mapper/internal/operations/tres_test.go +++ b/connectors/SLURM/Rest-Client/pkg/client/tres_test.go @@ -1,5 +1,5 @@ // cli/internal/client/tres_test.go -package operations +package client import ( "reflect" diff --git a/connectors/SLURM/Association-Mapper/internal/operations/types.go b/connectors/SLURM/Rest-Client/pkg/client/types.go similarity index 99% rename from connectors/SLURM/Association-Mapper/internal/operations/types.go rename to connectors/SLURM/Rest-Client/pkg/client/types.go index e00e83d3f..3863b77a7 100644 --- a/connectors/SLURM/Association-Mapper/internal/operations/types.go +++ b/connectors/SLURM/Rest-Client/pkg/client/types.go @@ -1,5 +1,5 @@ // cli/internal/client/types.go -package operations +package client import "encoding/json"
