USEFULL
/
drone
mirror of https://github.com/harness/drone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: [CDE-142]: specify resource for a gitspace in api call (#2249) 

* feat: [CDE-142]: specify resource for a gitspace in api call
unified-ui
Ansuman Satapathy 2024-07-19 05:56:35 +00:00 committed by Harness
parent 340cdd659c
commit b3d9a58c5c
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@ type CreateInput struct {
SpaceRef string `json:"space_ref"` // Ref of the parent space SpaceRef string `json:"space_ref"` // Ref of the parent space
IDE enum.IDEType `json:"ide"` IDE enum.IDEType `json:"ide"`
ResourceIdentifier string `json:"resource_identifier"` ResourceIdentifier string `json:"resource_identifier"`
ResourceSpaceRef string `json:"resource_space_ref"`
CodeRepoURL string `json:"code_repo_url"` CodeRepoURL string `json:"code_repo_url"`
Branch string `json:"branch"` Branch string `json:"branch"`
DevcontainerPath *string `json:"devcontainer_path"` DevcontainerPath *string `json:"devcontainer_path"`
@ -61,7 +62,7 @@ func (c *Controller) Create(
session *auth.Session, session *auth.Session,
in *CreateInput, in *CreateInput,
) (*types.GitspaceConfig, error) { ) (*types.GitspaceConfig, error) {
parentSpace, err := c.spaceStore.FindByRef(ctx, in.SpaceRef) space, err := c.spaceStore.FindByRef(ctx, in.SpaceRef)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to find parent by ref: %w", err) return nil, fmt.Errorf("failed to find parent by ref: %w", err)
} }
@ -69,7 +70,7 @@ func (c *Controller) Create(
ctx, ctx,
c.authorizer, c.authorizer,
session, session,
parentSpace.Path, space.Path,
"", "",
enum.PermissionGitspaceEdit); err != nil { enum.PermissionGitspaceEdit); err != nil {
return nil, err return nil, err
@ -85,14 +86,31 @@ func (c *Controller) Create(
now := time.Now().UnixMilli() now := time.Now().UnixMilli()
var gitspaceConfig *types.GitspaceConfig var gitspaceConfig *types.GitspaceConfig
resourceIdentifier := in.ResourceIdentifier resourceIdentifier := in.ResourceIdentifier
err = c.createOrFindInfraProviderResource(ctx, parentSpace, resourceIdentifier, now) // assume resource to be in same space if its not explicitly specified.
if in.ResourceSpaceRef == "" {
in.ResourceSpaceRef = in.SpaceRef
}
resourceSpace, err := c.spaceStore.FindByRef(ctx, in.ResourceSpaceRef)
if err != nil {
return nil, fmt.Errorf("failed to find parent by ref: %w", err)
}
if err = apiauth.CheckInfraProvider(
ctx,
c.authorizer,
session,
resourceSpace.Path,
resourceIdentifier,
enum.PermissionInfraProviderAccess); err != nil {
return nil, err
}
err = c.createOrFindInfraProviderResource(ctx, resourceSpace, resourceIdentifier, now)
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = c.tx.WithTx(ctx, func(ctx context.Context) error { err = c.tx.WithTx(ctx, func(ctx context.Context) error {
infraProviderResource, err := c.infraProviderSvc.FindResourceByIdentifier( infraProviderResource, err := c.infraProviderSvc.FindResourceByIdentifier(
ctx, ctx,
parentSpace.ID, resourceSpace.ID,
resourceIdentifier) resourceIdentifier)
if err != nil { if err != nil {
return fmt.Errorf("could not find infra provider resource : %q %w", resourceIdentifier, err) return fmt.Errorf("could not find infra provider resource : %q %w", resourceIdentifier, err)
@ -109,8 +127,8 @@ func (c *Controller) Create(
Branch: in.Branch, Branch: in.Branch,
DevcontainerPath: in.DevcontainerPath, DevcontainerPath: in.DevcontainerPath,
UserID: session.Principal.UID, UserID: session.Principal.UID,
SpaceID: parentSpace.ID, SpaceID: space.ID,
SpacePath: parentSpace.Path, SpacePath: space.Path,
Created: now, Created: now,
Updated: now, Updated: now,
} }