Added local file access

Author: stuartpa

cmd/modern/root.go

@@ -67,6 +67,7 @@ func (c *Root) SubCommands() []cmdparser.Command {
 		cmdparser.New[*root.Query](dependencies),
 		cmdparser.New[*root.Start](dependencies),
 		cmdparser.New[*root.Stop](dependencies),
+		cmdparser.New[*root.System](dependencies),
 		cmdparser.New[*root.Uninstall](dependencies),
 		cmdparser.New[*root.Use](dependencies),
 	}

cmd/modern/root/install/mssql-base.go

@@ -9,9 +9,7 @@ import (
 	"fmt"
 	"github.com/microsoft/go-sqlcmd/internal/cmdparser/dependency"
 	"github.com/microsoft/go-sqlcmd/internal/tools"
-	"net/url"
 	"os"
-	"path/filepath"
 	"runtime"
 	"strings"
 
@@ -23,7 +21,6 @@ import (
 	"github.com/microsoft/go-sqlcmd/internal/cmdparser"
 	"github.com/microsoft/go-sqlcmd/internal/config"
 	"github.com/microsoft/go-sqlcmd/internal/container"
-	"github.com/microsoft/go-sqlcmd/internal/http"
 	"github.com/microsoft/go-sqlcmd/internal/output"
 	"github.com/microsoft/go-sqlcmd/internal/pal"
 	"github.com/microsoft/go-sqlcmd/internal/secret"
@@ -298,7 +295,7 @@ func (c *MssqlBase) createContainer(imageName string, contextName string) {
 
 	// Do an early exit if url doesn't exist
 	if c.usingDatabaseUrl != "" {
-		c.validateUsingUrlExists()
+		mssqlcontainer.ValidateUsingUrlExists(c.usingDatabaseUrl, output)
 	}
 
 	if c.defaultDatabase != "" {
@@ -382,7 +379,15 @@ func (c *MssqlBase) createContainer(imageName string, contextName string) {
 
 	// Download and restore DB if asked
 	if c.usingDatabaseUrl != "" {
-		c.downloadAndRestoreDb(controller, containerId, userName, password)
+		mssqlcontainer.DownloadAndRestoreDb(
+			controller,
+			containerId,
+			c.usingDatabaseUrl,
+			userName,
+			password,
+			c.sql.Query,
+			c.Cmd.Output(),
+		)
 	}
 
 	if c.openTool == "" {
@@ -455,36 +460,6 @@ func (c *MssqlBase) createContainer(imageName string, contextName string) {
 		if c.openFile != "" {
 			args = append(args, c.openFile)
 
-			/*
-				var k registry.Key
-				prefix := "SOFTWARE\\Classes\\"
-				urlScheme := "sqlcmd"
-				basePath := prefix + urlScheme
-				permission := uint32(registry.QUERY_VALUE | registry.SET_VALUE)
-				baseKey := registry.CURRENT_USER
-
-				programLocation := "\"C:\\Windows\\notepad.exe\""
-
-				// create key
-				registry.CreateKey(baseKey, basePath, permission)
-
-				// set description
-				k.SetStringValue("", "Notepad app")
-				k.SetStringValue("URL Protocol", "")
-
-				// set icon
-				registry.CreateKey(registry.CURRENT_USER, "lumiere\\DefaultIcon", registry.ALL_ACCESS)
-				k.SetStringValue("", programLocation+",1")
-
-				// create tree
-				registry.CreateKey(baseKey, basePath+"\\shell", permission)
-				registry.CreateKey(baseKey, basePath+"\\shell\\open", permission)
-				registry.CreateKey(baseKey, basePath+"\\shell\\open\\command", permission)
-
-				// set open command
-				k.SetStringValue("", programLocation+" \"%1\"")
-			*/
-
 			a := os.Args[1:]
 			data, _ := json.Marshal(&a)
 
@@ -498,45 +473,6 @@ func (c *MssqlBase) createContainer(imageName string, contextName string) {
 	}
 }
 
-func (c *MssqlBase) validateUsingUrlExists() {
-	output := c.Cmd.Output()
-	databaseUrl := extractUrl(c.usingDatabaseUrl)
-	u, err := url.Parse(databaseUrl)
-	c.CheckErr(err)
-
-	if u.Scheme != "http" && u.Scheme != "https" {
-		output.FatalfWithHints(
-			[]string{
-				"--using URL must be http or https",
-			},
-			"%q is not a valid URL for --using flag", c.usingDatabaseUrl)
-	}
-
-	if u.Path == "" {
-		output.FatalfWithHints(
-			[]string{
-				"--using URL must have a path to .bak, .bacpac or .mdf (.7z) file",
-			},
-			"%q is not a valid URL for --using flag", c.usingDatabaseUrl)
-	}
-
-	_, f := filepath.Split(u.Path)
-	if filepath.Ext(f) != ".bak" && filepath.Ext(f) != ".bacpac" && filepath.Ext(f) != ".mdf" && filepath.Ext(f) != ".7z" {
-		output.FatalfWithHints(
-			[]string{
-				"--using file URL must be a .bak, .bacpac, or .mdf (.7z) file",
-			},
-			"Invalid --using file type, extension %q is not supported", filepath.Ext(f))
-	}
-
-	// Verify the url actually exists, and early exit if it doesn't
-	urlExists(databaseUrl, output)
-}
-
-func (c *MssqlBase) query(commandText string) {
-	c.sql.Query(commandText)
-}
-
 // createNonSaUser creates a user (non-sa) and assigns the sysadmin role
 // to the user. It also creates a default database with the provided name
 // and assigns the default database to the user. Finally, it disables
@@ -554,7 +490,7 @@ func (c *MssqlBase) createNonSaUser(
 
 		// Create the default database, if it isn't a downloaded database
 		output.Infof("Creating default database [%s]", defaultDatabase)
-		c.query(fmt.Sprintf("CREATE DATABASE [%s]", defaultDatabase))
+		c.sql.Query(fmt.Sprintf("CREATE DATABASE [%s]", defaultDatabase))
 	}
 
 	const createLogin = `CREATE LOGIN [%s]
@@ -566,64 +502,21 @@ CHECK_POLICY=OFF`
 @loginame = N'%s',
 @rolename = N'sysadmin'`
 
-	c.query(fmt.Sprintf(createLogin, userName, password, defaultDatabase))
-	c.query(fmt.Sprintf(addSrvRoleMember, userName))
+	c.sql.Query(fmt.Sprintf(createLogin, userName, password, defaultDatabase))
+	c.sql.Query(fmt.Sprintf(addSrvRoleMember, userName))
 
 	// Correct safety protocol is to rotate the sa password, because the first
 	// sa password has been in the docker environment (as SA_PASSWORD)
-	c.query(fmt.Sprintf("ALTER LOGIN [sa] WITH PASSWORD = N'%s';",
+	c.sql.Query(fmt.Sprintf("ALTER LOGIN [sa] WITH PASSWORD = N'%s';",
 		c.generatePassword()))
-	c.query("ALTER LOGIN [sa] DISABLE")
+	c.sql.Query("ALTER LOGIN [sa] DISABLE")
 
 	if c.defaultDatabase != "" {
-		c.query(fmt.Sprintf("ALTER AUTHORIZATION ON DATABASE::[%s] TO %s",
+		c.sql.Query(fmt.Sprintf("ALTER AUTHORIZATION ON DATABASE::[%s] TO %s",
 			defaultDatabase, userName))
 	}
 }
 
-func extractUrl(usingArg string) string {
-	urlEndIdx := strings.LastIndex(usingArg, ".bak")
-	if urlEndIdx == -1 {
-		urlEndIdx = strings.LastIndex(usingArg, ".mdf")
-	}
-	if urlEndIdx != -1 {
-		return usingArg[0:(urlEndIdx + 4)]
-	}
-
-	if urlEndIdx == -1 {
-		urlEndIdx = strings.LastIndex(usingArg, ".7z")
-		if urlEndIdx != -1 {
-			return usingArg[0:(urlEndIdx + 3)]
-		}
-	}
-
-	if urlEndIdx == -1 {
-		urlEndIdx = strings.LastIndex(usingArg, ".bacpac")
-		if urlEndIdx != -1 {
-			return usingArg[0:(urlEndIdx + 7)]
-		}
-	}
-
-	return usingArg
-}
-
-func (c *MssqlBase) downloadAndRestoreDb(
-	controller *container.Controller,
-	containerId string,
-	userName string,
-	password string,
-) {
-	mssqlcontainer.DownloadAndRestoreDb(
-		controller,
-		containerId,
-		c.usingDatabaseUrl,
-		userName,
-		password,
-		c.query,
-		c.Cmd.Output(),
-	)
-}
-
 func (c *MssqlBase) downloadImage(
 	imageName string,
 	output *output.Output,
@@ -647,15 +540,6 @@ func (c *MssqlBase) downloadImage(
 	}
 }
 
-// Verify the file exists at the URL
-func urlExists(url string, output *output.Output) {
-	if !http.UrlExists(url) {
-		output.FatalfWithHints(
-			[]string{"File does not exist at URL"},
-			"Unable to download file")
-	}
-}
-
 func (c *MssqlBase) generatePassword() (password string) {
 	password = secret.Generate(
 		c.passwordLength,

cmd/modern/root/install/mssql-base_test.go

@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+package root
+
+import (
+	"github.com/microsoft/go-sqlcmd/cmd/modern/root/system"
+	"github.com/microsoft/go-sqlcmd/internal/cmdparser"
+)
+
+// Config defines the `sqlcmd system` sub-commands
+type System struct {
+	cmdparser.Cmd
+}
+
+func (c *System) DefineCommand(...cmdparser.CommandOptions) {
+	options := cmdparser.CommandOptions{
+		Use:         "system",
+		Short:       `Modify system wide options like the protocol handler or container runtime cache"`,
+		SubCommands: c.SubCommands(),
+		Examples: []cmdparser.ExampleOptions{
+			{
+				Description: "Register the sqlcmd:// protocol handler",
+				Steps: []string{
+					"sqlcmd system protocol add-handler"},
+			},
+		},
+	}
+
+	c.Cmd.DefineCommand(options)
+}
+
+// SubCommands sets up all the sub-commands for `sqlcmd config`
+func (c *System) SubCommands() []cmdparser.Command {
+	dependencies := c.Dependencies()
+
+	return []cmdparser.Command{
+		cmdparser.New[*system.Protocol](dependencies),
+	}
+}

cmd/modern/root/system.go

@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+package system
+
+import (
+	"fmt"
+	"github.com/microsoft/go-sqlcmd/cmd/modern/root/system/protocol"
+	"github.com/microsoft/go-sqlcmd/internal/cmdparser"
+	"github.com/microsoft/go-sqlcmd/internal/pal"
+)
+
+// Protocol defines the `sqlcmd system protocol` sub-commands
+type Protocol struct {
+	cmdparser.Cmd
+}
+
+func (c *Protocol) DefineCommand(...cmdparser.CommandOptions) {
+	options := cmdparser.CommandOptions{
+		Use:         "protocol",
+		Short:       `Register/Unregsiter the sqlcmd:// protocol handler`,
+		SubCommands: c.SubCommands(),
+		Examples: []cmdparser.ExampleOptions{
+			{
+				Description: "Add context for existing endpoint and user (use SQLCMD_PASSWORD or SQLCMDPASSWORD)",
+				Steps: []string{
+					fmt.Sprintf("%s SQLCMD_PASSWORD=<placeholderpassword>", pal.CreateEnvVarKeyword()),
+					"sqlcmd config add-user --name sa1434 --username sa",
+					fmt.Sprintf("%s SQLCMD_PASSWORD=", pal.CreateEnvVarKeyword()),
+					"sqlcmd config add-endpoint --name ep1434 --address localhost --port 1434",
+					"sqlcmd config add-context --name mssql1434 --user sa1434 --endpoint ep1434"},
+			},
+		},
+	}
+
+	c.Cmd.DefineCommand(options)
+}
+
+// SubCommands sets up all the sub-commands for `sqlcmd config`
+func (c *Protocol) SubCommands() []cmdparser.Command {
+	dependencies := c.Dependencies()
+
+	return []cmdparser.Command{
+		cmdparser.New[*protocol.AddHandler](dependencies),
+		cmdparser.New[*protocol.DeleteHandler](dependencies),
+	}
+}