2
0
Alexander Belanger 4 жил өмнө
parent
commit
ead3b37899

+ 5 - 0
api/types/infra.go

@@ -1,5 +1,7 @@
 package types
 
+import "time"
+
 // InfraStatus is the status that an infrastructure can take
 type InfraStatus string
 
@@ -29,6 +31,9 @@ const (
 type Infra struct {
 	ID uint `json:"id"`
 
+	CreatedAt time.Time `json:"created_at"`
+	UpdatedAt time.Time `json:"updated_at"`
+
 	// The project that this integration belongs to
 	ProjectID uint `json:"project_id"`
 

+ 2 - 2
dashboard/src/main/home/onboarding/steps/ProvisionResources/ProvisionResources.tsx

@@ -10,7 +10,7 @@ import FormFlowWrapper from "./forms/FormFlow";
 import ConnectExternalCluster from "./forms/_ConnectExternalCluster";
 import { SupportedProviders } from "../../types";
 import backArrow from "assets/back_arrow.png";
-import { SharedStatus } from "./forms/Status";
+import { SharedStatus } from "./forms/SharedStatus";
 
 type Props = {
   provider: SupportedProviders | "external";
@@ -61,7 +61,7 @@ const ProvisionResources: React.FC<Props> = ({
         return (
           <>
             <SharedStatus
-              project={project}
+              project_id={project?.id}
               filter={[]}
               nextFormStep={console.log}
             />

+ 1 - 1
dashboard/src/main/home/onboarding/steps/ProvisionResources/forms/_AWSProvisionerForm.tsx

@@ -281,7 +281,7 @@ export const Status: React.FC<{
   return (
     <SharedStatus
       nextFormStep={nextFormStep}
-      project={project}
+      project_id={project?.id}
       filter={["eks", "ecr"]}
     />
   );

+ 1 - 1
dashboard/src/main/home/onboarding/steps/ProvisionResources/forms/_DOProvisionerForm.tsx

@@ -234,7 +234,7 @@ export const Status: React.FC<{
   return (
     <SharedStatus
       nextFormStep={nextFormStep}
-      project={project}
+      project_id={project?.id}
       filter={["doks", "docr"]}
     />
   );

+ 1 - 1
dashboard/src/main/home/onboarding/steps/ProvisionResources/forms/_GCPProvisionerForm.tsx

@@ -256,7 +256,7 @@ export const Status: React.FC<{
   return (
     <SharedStatus
       nextFormStep={nextFormStep}
-      project={project}
+      project_id={project?.id}
       filter={["gke", "gcr"]}
     />
   );

+ 1 - 2
docker/dev.Dockerfile

@@ -10,8 +10,7 @@ RUN go mod download
 
 COPY . ./
 
-RUN go build -ldflags '-w -s' -a -o ./bin/migrate ./cmd/migrate \
-    && chmod +x /porter/docker/bin/*
+RUN chmod +x /porter/docker/bin/*
 
 # for live reloading of go container
 RUN go get github.com/cosmtrek/air

+ 2 - 0
internal/models/infra.go

@@ -54,6 +54,8 @@ type Infra struct {
 func (i *Infra) ToInfraType() *types.Infra {
 	return &types.Infra{
 		ID:               i.ID,
+		CreatedAt:        i.CreatedAt,
+		UpdatedAt:        i.UpdatedAt,
 		ProjectID:        i.ProjectID,
 		Kind:             i.Kind,
 		Status:           i.Status,