imple for issue #9

config/config.go

@@ -35,10 +35,11 @@ func LoadConf(filename string) (*Config, error) {
 }
 
 type Config struct {
-	Debug   bool          `json:"debug"`
-	Slack   SlackConfig   `json:"slack" validate:"required"`
-	GitHub  GitHubConfig  `json:"github" validate:"required"`
-	Release ReleaseConfig `json:"release" validate:"required"`
+	Debug     bool            `json:"debug"`
+	Slack     SlackConfig     `json:"slack" validate:"required"`
+	GitHub    GitHubConfig    `json:"github" validate:"required"`
+	Release   ReleaseConfig   `json:"release" validate:"required"`
+	Broadcast BroadcastConfig `json:"broadcast"`
 }
 
 // for each external service
@@ -63,3 +64,7 @@ type ReleaseTarget struct {
 	Url        string `json:"url" validate:"required"`
 	BaseBranch string `json:"baseBranch" default:"main"`
 }
+
+type BroadcastConfig struct {
+	EndpointUrl string `json:"endpointUrl"`
+}

docs/broadcast.md

@@ -0,0 +1,8 @@
+# broadcast コマンド
+
+## Summary
+
+`broadcast` コマンドは、 Slack から [cloudnativedaysjp/cnd-operation-server](https://github.com/cloudnativedaysjp/cnd-operation-server) を叩くためのコマンドです。
+
+cnd-operation-server の詳細は [cloudnativedaysjp/cnd-operation-server - README.md](https://github.com/cloudnativedaysjp/cnd-operation-server#readme) を確認してください。
+

docs/release.md

@@ -1,8 +1,8 @@
-# release サブコマンド
+# release コマンド
 
-## 概要
+## Summary
 
-`release` サブコマンドを呼び出すと、リポジトリとリリースレベルをそれぞれ選択することになります。これらを選択すると `release/major` などのラベルの付与された PR を自動生成するのがこのコマンドの責務です。
+`release` コマンドを呼び出すと、リポジトリとリリースレベルをそれぞれ選択することになります。これらを選択すると `release/major` などのラベルの付与された PR を自動生成するのがこのコマンドの責務です。
 
 注意点として、当コマンドの責務は上述した PR の作成のみです。以下は別途 GitHub Actions を利用して実現する必要があります。
 

example.yaml

@@ -9,3 +9,5 @@ release:
   targets:
   - url: https://github.com/ShotaKitazawa/kube-portal
     baseBranch: master
+broadcast:
+  endpointUrl: localhost:20080

seaman/api/broadcast.go

@@ -1,6 +1,33 @@
 package api
 
+import (
+	"fmt"
+	"strconv"
+	"strings"
+)
+
 const (
 	// Action IDs
 	ActIdBroadcast_SceneNext = "broadcast_scenenext"
 )
+
+type Track struct {
+	Id   int32
+	Name string
+}
+
+func NewTrack(str string) (Track, error) {
+	s := strings.Split(str, "__")
+	if len(s) != 2 {
+		return Track{}, fmt.Errorf("callbackValue (%s) is not expected", str)
+	}
+	trackId, err := strconv.Atoi(s[0])
+	if err != nil {
+		return Track{}, fmt.Errorf("callbackValue (%s) is not expected", str)
+	}
+	return Track{int32(trackId), s[1]}, nil
+}
+
+func (m Track) String() string {
+	return fmt.Sprintf("%d__%s", m.Id, m.Name)
+}

seaman/controller/broadcast.go

@@ -13,6 +13,7 @@ import (
 
 	pb "github.com/cloudnativedaysjp/cnd-operation-server/pkg/ws-proxy/schema"
 
+	"github.com/cloudnativedaysjp/seaman/seaman/api"
 	infra_cnd "github.com/cloudnativedaysjp/seaman/seaman/infra/cnd-operation-server"
 	infra_slack "github.com/cloudnativedaysjp/seaman/seaman/infra/slack"
 	"github.com/cloudnativedaysjp/seaman/seaman/utils"
@@ -21,15 +22,15 @@ import (
 
 type BroadcastController struct {
 	slackFactory   infra_slack.SlackClientFactory
-	cndSceneClient pb.TrackServiceClient
+	cndSceneClient pb.SceneServiceClient
 	cndTrackClient pb.TrackServiceClient
 	log            logr.Logger
 }
 
 func NewBroadcastController(
 	logger logr.Logger,
 	slackFactory infra_slack.SlackClientFactory,
-	cndClient infra_cnd.CndWrapper,
+	cndClient *infra_cnd.CndWrapper,
 ) *BroadcastController {
 	return &BroadcastController{slackFactory, cndClient, cndClient, logger}
 }
@@ -69,14 +70,14 @@ func (c *BroadcastController) ListTrack(evt *socketmode.Event, client *socketmod
 	}
 }
 
-func (c *BroadcastController) DisableAutomation(evt *socketmode.Event, client *socketmode.Client) {
+func (c *BroadcastController) EnableAutomation(evt *socketmode.Event, client *socketmode.Client) {
 	client.Ack(*evt.Request)
-	c.switchAutomation(evt, client, false)
+	c.switchAutomation(evt, client, true)
 }
 
-func (c *BroadcastController) EnableAutomation(evt *socketmode.Event, client *socketmode.Client) {
+func (c *BroadcastController) DisableAutomation(evt *socketmode.Event, client *socketmode.Client) {
 	client.Ack(*evt.Request)
-	c.switchAutomation(evt, client, true)
+	c.switchAutomation(evt, client, false)
 }
 
 func (c *BroadcastController) switchAutomation(evt *socketmode.Event, client *socketmode.Client, enabled bool) {
@@ -140,3 +141,44 @@ func (c *BroadcastController) switchAutomation(evt *socketmode.Event, client *so
 		return
 	}
 }
+
+func (c *BroadcastController) UpdateSceneToNext(evt *socketmode.Event, client *socketmode.Client) {
+	client.Ack(*evt.Request)
+
+	interaction, err := getInteractionCallback(evt)
+	if err != nil {
+		c.log.Error(err, "failed to get InteractionCallback")
+		return
+	}
+	channelId := interaction.Container.ChannelID
+	messageTs := interaction.Container.MessageTs
+	callbackValue := interaction.ActionCallback.BlockActions[0].SelectedOption.Value
+	// init logger & context
+	logger := c.log.WithValues("messageTs", messageTs)
+	ctx := utils.IntoContext(context.Background(), logger)
+	// new client from factory
+	sc, err := c.slackFactory.New(client.Client)
+	if err != nil {
+		logger.Error(xerrors.Errorf("message: %w", err), "failed to initialize Slack client")
+	}
+
+	track, err := api.NewTrack(callbackValue)
+	if err != nil {
+		_ = sc.PostMessage(ctx, channelId, view.InvalidArguments(messageTs,
+			"callbackValue (trackId) must be integer"))
+		return
+	}
+
+	if _, err := c.cndSceneClient.MoveSceneToNext(ctx,
+		&pb.MoveSceneToNextRequest{TrackId: track.Id}); err != nil {
+		_ = sc.PostMessage(ctx, channelId, view.SomethingIsWrong(messageTs))
+		return
+	}
+
+	if err := sc.UpdateMessage(ctx, channelId, messageTs,
+		view.BroadcastMovedToNextScene(track)); err != nil {
+		logger.Error(xerrors.Errorf("message: %w", err), "failed to post message: %v", err)
+		_ = sc.UpdateMessage(ctx, channelId, messageTs, view.SomethingIsWrong(messageTs))
+		return
+	}
+}

seaman/controller/release.go

@@ -69,6 +69,7 @@ func (c *ReleaseController) SelectRepository(evt *socketmode.Event, client *sock
 	); err != nil {
 		logger.Error(xerrors.Errorf("message: %w", err), "failed to post message")
 		_ = sc.PostMessage(ctx, channelId, view.SomethingIsWrong(messageTs))
+		return
 	}
 }
 
@@ -90,6 +91,7 @@ func (c *ReleaseController) SelectReleaseLevel(evt *socketmode.Event, client *so
 	sc, err := c.slackFactory.New(client.Client)
 	if err != nil {
 		logger.Error(xerrors.Errorf("message: %w", err), "failed to initialize Slack client")
+		return
 	}
 
 	orgRepo, err := api.NewOrgRepo(callbackValue)

seaman/server.go

@@ -9,10 +9,15 @@ import (
 	"github.com/slack-go/slack/slackevents"
 	"github.com/slack-go/slack/socketmode"
 	"go.uber.org/zap"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+
+	pb "github.com/cloudnativedaysjp/cnd-operation-server/pkg/ws-proxy/schema"
 
 	"github.com/cloudnativedaysjp/seaman/config"
 	"github.com/cloudnativedaysjp/seaman/seaman/api"
 	"github.com/cloudnativedaysjp/seaman/seaman/controller"
+	cndoperationserver "github.com/cloudnativedaysjp/seaman/seaman/infra/cnd-operation-server"
 	"github.com/cloudnativedaysjp/seaman/seaman/infra/gitcommand"
 	"github.com/cloudnativedaysjp/seaman/seaman/infra/githubapi"
 	infra_slack "github.com/cloudnativedaysjp/seaman/seaman/infra/slack"
@@ -53,21 +58,33 @@ func Run(conf *config.Config) error {
 	logger := zapr.NewLogger(zapLogger)
 
 	// setup some instances
-	slackClientFactory := infra_slack.NewSlackClientFactory()
+	slackFactory := infra_slack.NewSlackClientFactory()
 	githubApiClient := githubapi.NewGitHubApiClientImpl(conf.GitHub.AccessToken)
 	gitCommandClient := gitcommand.NewGitCommandClientImpl(conf.GitHub.Username, conf.GitHub.AccessToken)
+	var cndClient *cndoperationserver.CndWrapper
+	if conf.Broadcast.EndpointUrl != "" {
+		func() {
+			conn, err := grpc.Dial(conf.Broadcast.EndpointUrl,
+				grpc.WithTransportCredentials(insecure.NewCredentials()), // TODO (cloudnativedaysjp/cnd-operation-server#7)
+			)
+			if err != nil {
+				return
+			}
+			cndClient = cndoperationserver.NewCndWrapper(
+				pb.NewSceneServiceClient(conn), pb.NewTrackServiceClient(conn),
+			)
+		}()
+	}
 
 	{ // release
 		var targets []controller.Target
 		for _, target := range conf.Release.Targets {
 			targets = append(targets, controller.Target(target))
 		}
 		c := controller.NewReleaseController(logger,
-			slackClientFactory, gitCommandClient, githubApiClient, targets)
-
+			slackFactory, gitCommandClient, githubApiClient, targets)
 		socketmodeHandler.HandleEvents(
-			slackevents.AppMention, middleware.MiddlewareSet(
-				c.SelectRepository,
+			slackevents.AppMention, middleware.MiddlewareSet(c.SelectRepository,
 				middleware.RegisterCommand("release").
 					WithURL("https://github.com/cloudnativedaysjp/seaman/blob/main/docs/release.md"),
 			))
@@ -82,23 +99,35 @@ func Run(conf *config.Config) error {
 		socketmodeHandler.HandleInteractionBlockAction(
 			api.ActIdRelease_OK, c.CreatePullRequestForRelease)
 	}
-	{ // broadcast
-		// TODO
+	if cndClient != nil { // broadcast
+		c := controller.NewBroadcastController(logger, slackFactory, cndClient)
+		socketmodeHandler.HandleEvents(
+			slackevents.AppMention, middleware.MiddlewareSet(c.ListTrack,
+				middleware.RegisterCommand("broadcast", "list-track").
+					WithURL("https://github.com/cloudnativedaysjp/seaman/blob/main/docs/broadcast.md"),
+			))
+		socketmodeHandler.HandleEvents(
+			slackevents.AppMention, middleware.MiddlewareSet(c.EnableAutomation,
+				middleware.RegisterCommand("broadcast", "enable-track").
+					WithURL("https://github.com/cloudnativedaysjp/seaman/blob/main/docs/broadcast.md"),
+			))
+		socketmodeHandler.HandleEvents(
+			slackevents.AppMention, middleware.MiddlewareSet(c.DisableAutomation,
+				middleware.RegisterCommand("broadcast", "disable-track").
+					WithURL("https://github.com/cloudnativedaysjp/seaman/blob/main/docs/broadcast.md"),
+			))
+		socketmodeHandler.HandleInteractionBlockAction(
+			api.ActIdBroadcast_SceneNext, c.UpdateSceneToNext)
 	}
 	{ // common
 		c := controller.NewCommonController(logger,
-			slackClientFactory, middleware.Subcommands.List())
-
+			slackFactory, middleware.Subcommands.List())
 		socketmodeHandler.HandleEvents(
 			slackevents.AppMention, middleware.MiddlewareSet(
-				c.ShowCommands,
-				middleware.RegisterCommand("help"),
-			))
+				c.ShowCommands, middleware.RegisterCommand("help")))
 		socketmodeHandler.HandleEvents(
 			slackevents.AppMention, middleware.MiddlewareSet(
-				c.ShowVersion,
-				middleware.RegisterCommand("version"),
-			))
+				c.ShowVersion, middleware.RegisterCommand("version")))
 		socketmodeHandler.HandleInteractionBlockAction(
 			api.ActIdCommon_Cancel, c.InteractionCancel)
 	}

seaman/view/broadcast.go

@@ -8,6 +8,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	pb "github.com/cloudnativedaysjp/cnd-operation-server/pkg/ws-proxy/schema"
+	"github.com/cloudnativedaysjp/seaman/seaman/api"
 )
 
 func BroadcastListTrack(track []*pb.Track) slack.Msg {
@@ -88,3 +89,24 @@ func broadcastEnabled(trackName string) (slack.Msg, error) {
 }
 `, trackName))
 }
+
+func BroadcastMovedToNextScene(track api.Track) slack.Msg {
+	result, _ := broadcastMovedToNextScene(track)
+	return result
+}
+
+func broadcastMovedToNextScene(track api.Track) (slack.Msg, error) {
+	return castFromStringToMsg(fmt.Sprintf(`
+{
+	"blocks": [
+		{
+			"type": "section",
+			"text": {
+				"type": "mrkdwn",
+				"text": "Track %s の自動切り替えを有効化しました"
+			}
+		}
+	]
+}
+`, track.Name))
+}