github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-08 03:32:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: [CDE-599]: Auto-creating infra resources at the root level. (#3383)

Browse Source 
* feat: [CDE-599]: Auto-creating infra resources at the root level.
This commit is contained in:
Dhruv Dhruv 2025-02-07 03:47:59 +00:00 committed by Harness
parent 1c30053bd6
commit e42e24cdfe
4 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/api/controller/gitspace/controller.go
View File

@ -30,6 +30,7 @@ type Controller struct {
authorizer authz.Authorizer
infraProviderSvc *infraprovider.Service
spaceCache refcache.SpaceCache
spaceStore store.SpaceStore
gitspaceEventStore store.GitspaceEventStore
tx dbtx.Transactor
statefulLogger *logutil.StatefulLogger
@ -44,6 +45,7 @@ func NewController(
authorizer authz.Authorizer,
infraProviderSvc *infraprovider.Service,
spaceCache refcache.SpaceCache,
spaceStore store.SpaceStore,
gitspaceEventStore store.GitspaceEventStore,
statefulLogger *logutil.StatefulLogger,
scm *scm.SCM,
@ -56,6 +58,7 @@ func NewController(
authorizer: authorizer,
infraProviderSvc: infraProviderSvc,
spaceCache: spaceCache,
spaceStore: spaceStore,
gitspaceEventStore: gitspaceEventStore,
statefulLogger: statefulLogger,
scm: scm,

74
app/api/controller/gitspace/create.go
View File

@ -24,6 +24,7 @@ import (
apiauth "github.com/harness/gitness/app/api/auth"
"github.com/harness/gitness/app/api/usererror"
"github.com/harness/gitness/app/auth"
"github.com/harness/gitness/app/paths"
"github.com/harness/gitness/app/services/gitspace"
"github.com/harness/gitness/errors"
"github.com/harness/gitness/store"
@ -111,7 +112,11 @@ func (c *Controller) Create(
var gitspaceConfig *types.GitspaceConfig
// assume resource to be in same space if it's not explicitly specified.
if in.ResourceSpaceRef == "" {
in.ResourceSpaceRef = in.SpaceRef
rootSpaceRef, _, err := paths.DisectRoot(in.SpaceRef)
if err != nil {
return nil, fmt.Errorf("unable to find root space path for %s: %w", in.SpaceRef, err)
}
in.ResourceSpaceRef = rootSpaceRef
}
resourceIdentifier := in.ResourceIdentifier
resourceSpace, err := c.spaceCache.Get(ctx, in.ResourceSpaceRef)
@ -127,18 +132,11 @@ func (c *Controller) Create(
enum.PermissionInfraProviderAccess); err != nil {
return nil, err
}
err = c.createOrFindInfraProviderResource(ctx, resourceSpace, resourceIdentifier, now)
infraProviderResource, err := c.createOrFindInfraProviderResource(ctx, resourceSpace, resourceIdentifier, now)
if err != nil {
return nil, err
}
err = c.tx.WithTx(ctx, func(ctx context.Context) error {
infraProviderResource, err := c.infraProviderSvc.FindResourceByIdentifier(
ctx,
resourceSpace.ID,
resourceIdentifier)
if err != nil {
return fmt.Errorf("could not find infra provider resource : %q %w", resourceIdentifier, err)
}
codeRepo := types.CodeRepo{
URL: in.CodeRepoURL,
Ref: in.CodeRepoRef,
@ -183,34 +181,43 @@ func (c *Controller) Create(
func (c *Controller) createOrFindInfraProviderResource(
ctx context.Context,
parentSpace *types.Space,
resourceSpace *types.Space,
resourceIdentifier string,
now int64,
) error {
_, err := c.infraProviderSvc.FindResourceByIdentifier(
ctx,
parentSpace.ID,
resourceIdentifier)
if err != nil &&
errors.Is(err, store.ErrResourceNotFound) &&
resourceIdentifier == defaultResourceIdentifier {
err = c.autoCreateDefaultResource(ctx, parentSpace, now)
) (*types.InfraProviderResource, error) {
var resource *types.InfraProviderResource
var err error
resource, err = c.infraProviderSvc.FindResourceByIdentifier(ctx, resourceSpace.ID, resourceIdentifier)
if err != nil && errors.Is(err, store.ErrResourceNotFound) && resourceIdentifier == defaultResourceIdentifier {
resource, err = c.autoCreateDefaultResource(ctx, resourceSpace, now)
if err != nil {
return err
return nil, err
}
} else if err != nil {
return fmt.Errorf("could not find infra provider resource : %q %w", resourceIdentifier, err)
return nil, fmt.Errorf("could not find infra provider resource : %q %w", resourceIdentifier, err)
}
return err
return resource, err
}
func (c *Controller) autoCreateDefaultResource(ctx context.Context, parentSpace *types.Space, now int64) error {
func (c *Controller) autoCreateDefaultResource(
ctx context.Context,
currentSpace *types.Space,
now int64,
) (*types.InfraProviderResource, error) {
rootSpace, err := c.spaceStore.GetRootSpace(ctx, currentSpace.ID)
if err != nil {
return nil, fmt.Errorf("could not get root space for space %s while autocreating default docker "+
"resource: %w", currentSpace.Path, err)
}
defaultDockerConfig := &types.InfraProviderConfig{
Identifier: defaultResourceIdentifier,
Name: "default docker infrastructure",
Type: enum.InfraProviderTypeDocker,
SpaceID: parentSpace.ID,
SpacePath: parentSpace.Path,
SpaceID: rootSpace.ID,
SpacePath: rootSpace.Path,
Created: now,
Updated: now,
}
@ -223,17 +230,24 @@ func (c *Controller) autoCreateDefaultResource(ctx context.Context, parentSpace
Memory: wrapString("any"),
Disk: wrapString("any"),
Network: wrapString("standard"),
SpaceID: parentSpace.ID,
SpacePath: parentSpace.Path,
SpaceID: rootSpace.ID,
SpacePath: rootSpace.Path,
Created: now,
Updated: now,
}
defaultDockerConfig.Resources = []types.InfraProviderResource{defaultResource}
err := c.infraProviderSvc.CreateInfraProvider(ctx, defaultDockerConfig)
err = c.infraProviderSvc.CreateInfraProvider(ctx, defaultDockerConfig)
if err != nil {
return fmt.Errorf("could not auto-create the infra provider: %w", err)
return nil, fmt.Errorf("could not auto-create the infra provider: %w", err)
}
return nil
resource, err := c.infraProviderSvc.FindResourceByIdentifier(ctx, rootSpace.ID, defaultResourceIdentifier)
if err != nil {
return nil, fmt.Errorf("could not find infra provider resource : %q %w", defaultResourceIdentifier, err)
}
return resource, nil
}
func wrapString(str string) *string {

2
app/api/controller/gitspace/wire.go
View File

@ -38,6 +38,7 @@ func ProvideController(
authorizer authz.Authorizer,
infraProviderSvc *infraprovider.Service,
spaceCache refcache.SpaceCache,
spaceStore store.SpaceStore,
eventStore store.GitspaceEventStore,
statefulLogger *logutil.StatefulLogger,
scm *scm.SCM,
@ -50,6 +51,7 @@ func ProvideController(
authorizer,
infraProviderSvc,
spaceCache,
spaceStore,
eventStore,
statefulLogger,
scm,

2
cmd/gitness/wire_gen.go
View File

@ -427,7 +427,7 @@ func initSystem(ctx context.Context, config *types.Config) (*server.System, erro
keywordsearchController := keywordsearch2.ProvideController(authorizer, searcher, repoController, spaceController)
infraproviderController := infraprovider3.ProvideController(authorizer, spaceCache, infraproviderService)
limiterGitspace := limiter.ProvideGitspaceLimiter()
gitspaceController := gitspace2.ProvideController(transactor, authorizer, infraproviderService, spaceCache, gitspaceEventStore, statefulLogger, scmSCM, gitspaceService, limiterGitspace, repoFinder)
gitspaceController := gitspace2.ProvideController(transactor, authorizer, infraproviderService, spaceCache, spaceStore, gitspaceEventStore, statefulLogger, scmSCM, gitspaceService, limiterGitspace, repoFinder)
rule := migrate.ProvideRuleImporter(ruleStore, transactor, principalStore)
migrateWebhook := migrate.ProvideWebhookImporter(webhookConfig, transactor, webhookStore)
migrateLabel := migrate.ProvideLabelImporter(transactor, labelStore, labelValueStore, spaceStore)