feat(server): add GeospatialjpCloudBuildDiskSizeGb option

eukarya-inc · Feb 28, 2024 · c1ec006 · c1ec006
1 parent 9ac90fe
commit c1ec006
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/server/cmsintegration/cmsintegrationcommon/config.go b/server/cmsintegration/cmsintegrationcommon/config.go
@@ -29,6 +29,7 @@ type Config struct {
 	GeospatialjpCloudBuildMachineType string
 	GeospatialjpCloudBuildProject     string
 	GeospatialjpCloudBuildRegion      string
+	GeospatialjpCloudBuildDiskSizeGb  int64
 
 	// compat
 	// geospatial.jp v2

diff --git a/server/cmsintegration/cmsintegrationv3/geospatialjpv3/common.go b/server/cmsintegration/cmsintegrationv3/geospatialjpv3/common.go
@@ -23,6 +23,7 @@ type Config struct {
 	CloudBuildMachineType string
 	CloudBuildProject     string
 	CloudBuildRegion      string
+	CloudBuildDiskSizeGb  int64
 }
 
 var ppp *pp.PrettyPrinter

diff --git a/server/cmsintegration/cmsintegrationv3/geospatialjpv3/prepare.go b/server/cmsintegration/cmsintegrationv3/geospatialjpv3/prepare.go
@@ -17,6 +17,7 @@ func Prepare(ctx context.Context, itemID, projectID string, conf Config) error {
 			CloudBuildMachineType: conf.CloudBuildMachineType,
 			CloudBuildProject:     conf.CloudBuildProject,
 			CloudBuildRegion:      conf.CloudBuildRegion,
+			CloudBuildDiskSizeGb:  conf.CloudBuildDiskSizeGb,
 		})
 	}
 }
diff --git a/server/cmsintegration/cmsintegrationv3/geospatialjpv3/prepare_cloudbuild.go b/server/cmsintegration/cmsintegrationv3/geospatialjpv3/prepare_cloudbuild.go
@@ -17,14 +17,19 @@ type prepareOnCloudBuildConfig struct {
 	CloudBuildMachineType string
 	CloudBuildProject     string
 	CloudBuildRegion      string
+	CloudBuildDiskSizeGb  int64
 }
 
 const defaultDockerImage = "eukarya/plateauview2-sidecar-worker:latest"
+const defaultDiskSizeGb = 1000
 
 func prepareOnCloudBuild(ctx context.Context, conf prepareOnCloudBuildConfig) error {
 	if conf.CloudBuildImage == "" {
 		conf.CloudBuildImage = defaultDockerImage
 	}
+	if conf.CloudBuildDiskSizeGb == 0 {
+		conf.CloudBuildDiskSizeGb = defaultDiskSizeGb
+	}
 
 	log.Debugfc(ctx, "geospatialjp webhook: prepare (cloud build): %s", ppp.Sprint(conf))
 
@@ -45,6 +50,7 @@ func prepareOnCloudBuild(ctx context.Context, conf prepareOnCloudBuildConfig) er
 		Project:     conf.CloudBuildProject,
 		Region:      conf.CloudBuildRegion,
 		Tags:        []string{"prepare-geospatialjp"},
+		DiskSizeGb:  conf.CloudBuildDiskSizeGb,
 	})
 }
 
@@ -56,6 +62,7 @@ type CloudBuildConfig struct {
 	Region      string
 	Project     string
 	Tags        []string
+	DiskSizeGb  int64
 }
 
 func runCloudBuild(ctx context.Context, conf CloudBuildConfig) error {
@@ -81,6 +88,7 @@ func runCloudBuild(ctx context.Context, conf CloudBuildConfig) error {
 		},
 		Options: &cloudbuild.BuildOptions{
 			MachineType: machineType,
+			DiskSizeGb:  conf.DiskSizeGb,
 		},
 		Tags: conf.Tags,
 	}

diff --git a/server/cmsintegration/handler.go b/server/cmsintegration/handler.go
@@ -109,6 +109,7 @@ func geospatialjpv3Config(conf Config) geospatialjpv3.Config {
 		CloudBuildMachineType: conf.GeospatialjpCloudBuildMachineType,
 		CloudBuildProject:     conf.GeospatialjpCloudBuildProject,
 		CloudBuildRegion:      conf.GeospatialjpCloudBuildRegion,
+		CloudBuildDiskSizeGb:  conf.GeospatialjpCloudBuildDiskSizeGb,
 	}
 }
 

diff --git a/server/config.go b/server/config.go
@@ -67,6 +67,7 @@ type Config struct {
 	Geospatialjp_CloudBuildMachineType string   `pp:",omitempty"`
 	Geospatialjp_CloudBuildProject     string   `pp:",omitempty"`
 	Geospatialjp_CloudBuildRegion      string   `pp:",omitempty"`
+	Geospatialjp_CloudBuildDiskSizeGb  int64    `pp:",omitempty"`
 	DataConv_Disable                   bool     `pp:",omitempty"`
 	Indexer_Delegate                   bool     `pp:",omitempty"`
 	DataCatalog_DisableCache           bool     `pp:",omitempty"`
@@ -134,6 +135,7 @@ func (c *Config) CMSIntegration() cmsintegration.Config {
 		GeospatialjpCloudBuildMachineType: c.Geospatialjp_CloudBuildMachineType,
 		GeospatialjpCloudBuildProject:     cloudBuildProject,
 		GeospatialjpCloudBuildRegion:      cloudBuildRegion,
+		GeospatialjpCloudBuildDiskSizeGb:  c.Geospatialjp_CloudBuildDiskSizeGb,
 	}
 }
 

diff --git a/worker/preparegspatialjp/command.go b/worker/preparegspatialjp/command.go
@@ -134,7 +134,7 @@ func Command(conf *Config) (err error) {
 			citygmlError, plateauError, maxlodError,
 			strings.TrimSpace(comment),
 		); err != nil {
-			log.Errorfc(ctx, "failed to notify error: %w", err)
+			log.Errorfc(ctx, "failed to notify error: %v", err)
 		}
 	}()
 
@@ -425,9 +425,9 @@ func notifyError(ctx context.Context, c *cms.CMS, cityItemID, gdataItemID string
 	if comment != "" {
 		msgPrefix := ""
 		if isErr {
-			msgPrefix = "マージ処理に失敗しました。"
+			msgPrefix = "公開準備処理に失敗しました。"
 		} else {
-			msgPrefix = "マージ処理が完了しました。"
+			msgPrefix = "公開準備処理が完了しました。"
 		}
 
 		if err := c.CommentToItem(ctx, cityItemID, msgPrefix+comment); err != nil {
@@ -439,7 +439,7 @@ func notifyError(ctx context.Context, c *cms.CMS, cityItemID, gdataItemID string
 		}
 	}
 
-	if !citygmlError && !plateauError {
+	if !citygmlError && !plateauError && !maxLODError {
 		return nil
 	}
 
@@ -483,6 +483,10 @@ func notifyError(ctx context.Context, c *cms.CMS, cityItemID, gdataItemID string
 		return fmt.Errorf("failed to marshal item")
 	}
 
+	if rawItem.Fields == nil {
+		rawItem.Fields = []*cms.Field{}
+	}
+
 	if _, err := c.UpdateItem(ctx, rawItem.ID, rawItem.Fields, rawItem.MetadataFields); err != nil {
 		return fmt.Errorf("failed to update item: %w", err)
 	}
@@ -526,11 +530,15 @@ func notifyRunning(ctx context.Context, c *cms.CMS, citygmlID, dataID string, ci
 	var rawItem cms.Item
 	cms.Marshal(item, &rawItem)
 
+	if rawItem.Fields == nil {
+		rawItem.Fields = []*cms.Field{}
+	}
+
 	if _, err := c.UpdateItem(ctx, rawItem.ID, rawItem.Fields, rawItem.MetadataFields); err != nil {
 		return fmt.Errorf("failed to update item: %w", err)
 	}
 
-	comment := "マージ処理を開始しました。"
+	comment := "G空間情報センターの公開準備処理を開始しました。"
 
 	if err := c.CommentToItem(ctx, citygmlID, comment); err != nil {
 		return fmt.Errorf("failed to comment to city item: %w", err)