feat(openamt): review, rename package

api/cmd/portainer/main.go

@@ -18,7 +18,7 @@ import (
 	"github.com/portainer/portainer/api/exec"
 	"github.com/portainer/portainer/api/filesystem"
 	"github.com/portainer/portainer/api/git"
-	"github.com/portainer/portainer/api/hostmanagement/intel/openamt"
+	"github.com/portainer/portainer/api/hostmanagement/openamt"
 	"github.com/portainer/portainer/api/http"
 	"github.com/portainer/portainer/api/http/client"
 	"github.com/portainer/portainer/api/http/proxy"

api/hostmanagement/openamt/openamt.go

@@ -73,7 +73,7 @@ func (service *Service) ConfigureDefault(configuration portainer.OpenAMTConfigur
 	}
 
 	wirelessConfigName := ""
-	if configuration.WirelessConfiguration.UseWirelessConfig {
+	if configuration.WirelessConfiguration != nil {
 		wirelessConfig, err := service.createOrUpdateWirelessConfig(configuration, DefaultWirelessConfigName)
 		if err != nil {
 			return err

api/http/handler/handler.go

@@ -17,7 +17,7 @@ import (
 	"github.com/portainer/portainer/api/http/handler/endpoints"
 	"github.com/portainer/portainer/api/http/handler/file"
 	"github.com/portainer/portainer/api/http/handler/helm"
-	"github.com/portainer/portainer/api/http/handler/hostmanagement/intel"
+	"github.com/portainer/portainer/api/http/handler/hostmanagement/openamt"
 	"github.com/portainer/portainer/api/http/handler/kubernetes"
 	"github.com/portainer/portainer/api/http/handler/ldap"
 	"github.com/portainer/portainer/api/http/handler/motd"
@@ -63,7 +63,7 @@ type Handler struct {
 	RoleHandler            *roles.Handler
 	SettingsHandler        *settings.Handler
 	SSLHandler             *ssl.Handler
-	IntelHandler           *intel.Handler
+	OpenAMTHandler         *openamt.Handler
 	StackHandler           *stacks.Handler
 	StatusHandler          *status.Handler
 	StorybookHandler       *storybook.Handler
@@ -223,8 +223,8 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		http.StripPrefix("/api", h.UserHandler).ServeHTTP(w, r)
 	case strings.HasPrefix(r.URL.Path, "/api/ssl"):
 		http.StripPrefix("/api", h.SSLHandler).ServeHTTP(w, r)
-	case strings.HasPrefix(r.URL.Path, "/api/open-amt"):
-		http.StripPrefix("/api", h.IntelHandler).ServeHTTP(w, r)
+	case strings.HasPrefix(r.URL.Path, "/api/open_amt"):
+		http.StripPrefix("/api", h.OpenAMTHandler).ServeHTTP(w, r)
 	case strings.HasPrefix(r.URL.Path, "/api/teams"):
 		http.StripPrefix("/api", h.TeamHandler).ServeHTTP(w, r)
 	case strings.HasPrefix(r.URL.Path, "/api/team_memberships"):

api/http/handler/hostmanagement/openamt/handler.go

@@ -1,4 +1,4 @@
-package intel
+package openamt
 
 import (
 	"net/http"
@@ -10,7 +10,7 @@ import (
 	"github.com/portainer/portainer/api/http/security"
 )
 
-// Handler is the HTTP handler used to handle Intel operations.
+// Handler is the HTTP handler used to handle OpenAMT operations.
 type Handler struct {
 	*mux.Router
 	OpenAMTService portainer.OpenAMTService
@@ -30,7 +30,7 @@ func NewHandler(bouncer *security.RequestBouncer, dataStore portainer.DataStore)
 
 	featureEnabled, _ := settings.FeatureFlagSettings[portainer.FeatOpenAMT]
 	if featureEnabled {
-		h.Handle("/open-amt", bouncer.AdminAccess(httperror.LoggerHandler(h.openAMTConfigureDefault))).Methods(http.MethodPost)
+		h.Handle("/open_amt", bouncer.AdminAccess(httperror.LoggerHandler(h.openAMTConfigureDefault))).Methods(http.MethodPost)
 	}
 
 	return h, nil

api/http/handler/hostmanagement/openamt/openamt.go

@@ -1,4 +1,4 @@
-package intel
+package openamt
 
 import (
 	"encoding/base64"
@@ -83,7 +83,7 @@ func (payload *openAMTConfigureDefaultPayload) Validate(r *http.Request) error {
 // @failure 400 "Invalid request"
 // @failure 403 "Permission denied to access settings"
 // @failure 500 "Server error"
-// @router /open-amt [post]
+// @router /open_amt [post]
 func (handler *Handler) openAMTConfigureDefault(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
 	var payload openAMTConfigureDefaultPayload
 	err := request.DecodeAndValidateJSONPayload(r, &payload)
@@ -156,13 +156,15 @@ func (handler *Handler) enableOpenAMT(configurationPayload openAMTConfigureDefau
 			CertPassword: configurationPayload.CertPassword,
 			DomainName:   configurationPayload.DomainName,
 		},
-		WirelessConfiguration: portainer.WirelessConfiguration{
-			UseWirelessConfig:    configurationPayload.UseWirelessConfig,
+	}
+
+	if configurationPayload.UseWirelessConfig {
+		configuration.WirelessConfiguration = &portainer.WirelessConfiguration{
 			AuthenticationMethod: configurationPayload.WifiAuthenticationMethod,
 			EncryptionMethod:     configurationPayload.WifiEncryptionMethod,
 			SSID:                 configurationPayload.WifiSSID,
 			PskPass:              configurationPayload.WifiPskPass,
-		},
+		}
 	}
 
 	err := handler.OpenAMTService.ConfigureDefault(configuration)

api/http/server.go

@@ -28,7 +28,7 @@ import (
 	"github.com/portainer/portainer/api/http/handler/endpoints"
 	"github.com/portainer/portainer/api/http/handler/file"
 	"github.com/portainer/portainer/api/http/handler/helm"
-	"github.com/portainer/portainer/api/http/handler/hostmanagement/intel"
+	"github.com/portainer/portainer/api/http/handler/hostmanagement/openamt"
 	kubehandler "github.com/portainer/portainer/api/http/handler/kubernetes"
 	"github.com/portainer/portainer/api/http/handler/ldap"
 	"github.com/portainer/portainer/api/http/handler/motd"
@@ -205,12 +205,12 @@ func (server *Server) Start() error {
 	var sslHandler = sslhandler.NewHandler(requestBouncer)
 	sslHandler.SSLService = server.SSLService
 
-	intelHandler, err := intel.NewHandler(requestBouncer, server.DataStore)
+	openAMTHandler, err := openamt.NewHandler(requestBouncer, server.DataStore)
 	if err != nil {
 		return err
 	}
-	intelHandler.OpenAMTService = server.OpenAMTService
-	intelHandler.DataStore = server.DataStore
+	openAMTHandler.OpenAMTService = server.OpenAMTService
+	openAMTHandler.DataStore = server.DataStore
 
 	var stackHandler = stacks.NewHandler(requestBouncer)
 	stackHandler.DataStore = server.DataStore
@@ -277,7 +277,7 @@ func (server *Server) Start() error {
 		HelmTemplatesHandler:   helmTemplatesHandler,
 		KubernetesHandler:      kubernetesHandler,
 		MOTDHandler:            motdHandler,
-		IntelHandler:           intelHandler,
+		OpenAMTHandler:         openAMTHandler,
 		RegistryHandler:        registryHandler,
 		ResourceControlHandler: resourceControlHandler,
 		SettingsHandler:        settingsHandler,

api/portainer.go

@@ -42,11 +42,11 @@ type (
 
 	// OpenAMTConfiguration represents the credentials and configurations used to connect to an OpenAMT MPS server
 	OpenAMTConfiguration struct {
-		Enabled               bool                  `json:"Enabled"`
-		MPSURL                string                `json:"MPSURL"`
-		Credentials           MPSCredentials        `json:"Credentials"`
-		DomainConfiguration   DomainConfiguration   `json:"DomainConfiguration"`
-		WirelessConfiguration WirelessConfiguration `json:"WirelessConfiguration"`
+		Enabled               bool                   `json:"Enabled"`
+		MPSURL                string                 `json:"MPSURL"`
+		Credentials           MPSCredentials         `json:"Credentials"`
+		DomainConfiguration   DomainConfiguration    `json:"DomainConfiguration"`
+		WirelessConfiguration *WirelessConfiguration `json:"WirelessConfiguration"`
 	}
 
 	MPSCredentials struct {
@@ -62,7 +62,6 @@ type (
 	}
 
 	WirelessConfiguration struct {
-		UseWirelessConfig    bool   `json:"UseWirelessConfig"`
 		AuthenticationMethod string `json:"AuthenticationMethod"`
 		EncryptionMethod     string `json:"EncryptionMethod"`
 		SSID                 string `json:"SSID"`

app/portainer/rest/openAMT.js

@@ -1,6 +1,6 @@
 import angular from 'angular';
 
-const API_ENDPOINT_OPEN_AMT = 'api/open-amt';
+const API_ENDPOINT_OPEN_AMT = 'api/open_amt';
 
 angular.module('portainer.app').factory('OpenAMT', OpenAMTFactory);