Skip to content

chore: use interfaces without indirects #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rainest wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: use interfaces without indirects #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
835018c
chore: use interfaces without indirects
rainest Jun 16, 2025
1185c5f
chore: remove unnecessary parens
rainest Jun 17, 2025
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
8 changes: 4 additions & 4 deletions cmd/power-control/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,9 @@ func runPCS(pcs *pcsConfig, etcd *etcdConfig, postgres *storage.PostgresConfig)

//DOMAIN CONFIGURATION
var domainGlobals domain.DOMAIN_GLOBALS
domainGlobals.NewGlobals(&BaseTRSTask, &TLOC_rf, &TLOC_svc, rfClient, svcClient,
rfClientLock, &Running, &DSP, &HSM, pcs.vaultEnabled,
&CS, &DLOCK, pcs.maxNumCompleted, pcs.expireTimeMins, podName)
domainGlobals.NewGlobals(&BaseTRSTask, TLOC_rf, TLOC_svc, rfClient, svcClient,
rfClientLock, &Running, DSP, HSM, pcs.vaultEnabled,
CS, DLOCK, pcs.maxNumCompleted, pcs.expireTimeMins, podName)

//Wait for vault PKI to respond for CA bundle. Once this happens, re-do
//the globals. This goroutine will run forever checking if the CA trust
Expand Down Expand Up @@ -362,7 +362,7 @@ func runPCS(pcs *pcsConfig, etcd *etcdConfig, postgres *storage.PostgresConfig)
prevCaChain = caChain

//update RF tloc and rfclient to the global areas! //TODO im not sure what part of this code is still needed; im guessing part of it at least!
domainGlobals.RFTloc = &TLOC_rf
domainGlobals.RFTloc = TLOC_rf
domainGlobals.RFHttpClient = rfClient
//hsmGlob.RFTloc = &TLOC_rf
//hsmGlob.RFHttpClient = rfClient
Expand Down
22 changes: 11 additions & 11 deletions internal/api/health.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,21 @@ func GetReadiness(w http.ResponseWriter, req *http.Request) {

//Check KVStore and dist locks

err = (*glb.DSP).Ping()
err = glb.DSP.Ping()
if err != nil {
logger.Log.Errorf("%s: Ping() failed to storage provider.", fname)
ready = false
}

err = (*glb.DistLock).Ping()
err = glb.DistLock.Ping()
if err != nil {
logger.Log.Errorf("%s: Ping() failed to dist lock provider.", fname)
ready = false
}

//Check HSM

err = (*glb.HSM).Ping()
err = glb.HSM.Ping()
if err != nil {
logger.Log.Errorf("%s: Ping() failed to HSM.", fname)
ready = false
Expand All @@ -89,15 +89,15 @@ func GetReadiness(w http.ResponseWriter, req *http.Request) {
//Check Vault

if glb.VaultEnabled {
if !(*glb.CS).IsReady() {
if !glb.CS.IsReady() {
logger.Log.Errorf("%s: Cred store is not ready.", fname)
ready = false
}
}

//Check TRS

alive, terr := (*glb.RFTloc).Alive()
alive, terr := glb.RFTloc.Alive()
if !alive || (terr != nil) {
logger.Log.Infof("%s: TRS not alive, err: %v", fname, err)
ready = false
Expand Down Expand Up @@ -132,7 +132,7 @@ func GetHealth(w http.ResponseWriter, req *http.Request) {
if glb.DSP == nil {
rspData.KvStore = unconnected
} else {
err = (*glb.DSP).Ping()
err = glb.DSP.Ping()
if err == nil {
rspData.KvStore = connected + sep + responsive
} else {
Expand All @@ -143,7 +143,7 @@ func GetHealth(w http.ResponseWriter, req *http.Request) {
if glb.DistLock == nil {
rspData.DistLocking = unconnected
} else {
err = (*glb.DistLock).Ping()
err = glb.DistLock.Ping()
if err == nil {
rspData.DistLocking = connected + sep + responsive
} else {
Expand All @@ -156,7 +156,7 @@ func GetHealth(w http.ResponseWriter, req *http.Request) {
if glb.HSM == nil {
rspData.StateManager = unconnected
} else {
err = (*glb.HSM).Ping()
err = glb.HSM.Ping()
if err == nil {
rspData.StateManager = connected + sep + responsive
} else {
Expand All @@ -170,7 +170,7 @@ func GetHealth(w http.ResponseWriter, req *http.Request) {
if glb.CS == nil {
rspData.Vault = unconnected
} else {
if (*glb.CS).IsReady() {
if glb.CS.IsReady() {
rspData.Vault = connected + sep + responsive
} else {
rspData.Vault = connected + sep + unresponsive
Expand All @@ -185,7 +185,7 @@ func GetHealth(w http.ResponseWriter, req *http.Request) {
if glb.RFTloc == nil {
rspData.TaskRunner = unconnected
} else {
alive, terr := (*glb.RFTloc).Alive()
alive, terr := glb.RFTloc.Alive()
if terr != nil {
rspData.TaskRunner = unconnected + sep + unresponsive
} else {
Expand All @@ -196,7 +196,7 @@ func GetHealth(w http.ResponseWriter, req *http.Request) {
}
}

ktype := reflect.TypeOf((*glb.RFTloc)).String()
ktype := reflect.TypeOf(glb.RFTloc).String()
ktypeTL := strings.ToLower(ktype)
if strings.Contains(ktypeTL, "local") {
rspData.TaskRunner = rspData.TaskRunner + sep + localmode
Expand Down
6 changes: 3 additions & 3 deletions internal/api/health_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ func setupGlobals(suite *Models_TS) {
}

var domainGlobals domain.DOMAIN_GLOBALS
domainGlobals.NewGlobals(nil, &TLOC_rf, nil, nil, nil,
nil, &Running, &DSP, &HSM, (ve != ""),
&CS, &DLOCK, 20000, 1440, "health_test-pod")
domainGlobals.NewGlobals(nil, TLOC_rf, nil, nil, nil,
nil, &Running, DSP, HSM, (ve != ""),
CS, DLOCK, 20000, 1440, "health_test-pod")
domain.Init(&domainGlobals)

}
Expand Down
24 changes: 12 additions & 12 deletions internal/domain/globals.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,33 +46,33 @@ func Init(glob *DOMAIN_GLOBALS) {
type DOMAIN_GLOBALS struct {
CAUri string
BaseTRSTask *trs_http_api.HttpTask
RFTloc *trs_http_api.TrsAPI
HSMTloc *trs_http_api.TrsAPI
RFTloc trs_http_api.TrsAPI
HSMTloc trs_http_api.TrsAPI
RFClientLock *sync.RWMutex
Running *bool
DSP *storage.StorageProvider
HSM *hsm.HSMProvider
DSP storage.StorageProvider
HSM hsm.HSMProvider
RFHttpClient *hms_certs.HTTPClientPair
SVCHttpClient *hms_certs.HTTPClientPair
RFTransportReady *bool
VaultEnabled bool
CS *credstore.CredStoreProvider
DistLock *storage.DistributedLockProvider
CS credstore.CredStoreProvider
DistLock storage.DistributedLockProvider
MaxNumCompleted int
ExpireTimeMins int
PodName string
}

func (g *DOMAIN_GLOBALS) NewGlobals(base *trs_http_api.HttpTask,
tlocRF *trs_http_api.TrsAPI,
tlocSVC *trs_http_api.TrsAPI,
tlocRF trs_http_api.TrsAPI,
tlocSVC trs_http_api.TrsAPI,
clientRF *hms_certs.HTTPClientPair,
clientSVC *hms_certs.HTTPClientPair,
rfClientLock *sync.RWMutex,
running *bool, dsp *storage.StorageProvider,
hsm *hsm.HSMProvider, vaultEnabled bool,
credStore *credstore.CredStoreProvider,
distLock *storage.DistributedLockProvider,
running *bool, dsp storage.StorageProvider,
hsm hsm.HSMProvider, vaultEnabled bool,
credStore credstore.CredStoreProvider,
distLock storage.DistributedLockProvider,
maxNumCompleted int, expireTimeMins int,
podName string) {
g.BaseTRSTask = base
Expand Down
Loading