convert pem keys automatically

Author: drewmalin

v1/providers/shadeform/instance.go

@@ -2,10 +2,15 @@ package v1
 
 import (
 	"context"
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/pem"
 	"errors"
 	"fmt"
 	"strings"
 
+	"golang.org/x/crypto/ssh"
+
 	"github.com/alecthomas/units"
 	v1 "github.com/brevdev/cloud/v1"
 	openapi "github.com/brevdev/cloud/v1/providers/shadeform/gen/shadeform"
@@ -124,9 +129,14 @@ func (c *ShadeformClient) CreateInstance(ctx context.Context, attrs v1.CreateIns
 func (c *ShadeformClient) addSSHKey(ctx context.Context, keyPairName string, publicKey string) (string, error) {
 	authCtx := c.makeAuthContext(ctx)
 
+	key, err := convertPEMKeyToOpenSSH(publicKey)
+	if err != nil {
+		return "", fmt.Errorf("failed to convert PEM key to RSA key: %w", err)
+	}
+
 	request := openapi.AddSshKeyRequest{
 		Name:      keyPairName,
-		PublicKey: publicKey,
+		PublicKey: key,
 	}
 
 	resp, httpResp, err := c.client.DefaultAPI.SshKeysAdd(authCtx).AddSshKeyRequest(request).Execute()
@@ -144,6 +154,33 @@ func (c *ShadeformClient) addSSHKey(ctx context.Context, keyPairName string, pub
 	return resp.Id, nil
 }
 
+func convertPEMKeyToOpenSSH(pemKey string) (string, error) {
+	// Decode PEM
+	block, _ := pem.Decode([]byte(pemKey))
+	if block == nil {
+		return "", fmt.Errorf("failed to decode PEM key")
+	}
+
+	// Parse into rsa.PublicKey
+	pubAny, err := x509.ParsePKIXPublicKey(block.Bytes)
+	if err != nil {
+		return "", fmt.Errorf("parse error: %w", err)
+	}
+
+	pub, ok := pubAny.(*rsa.PublicKey)
+	if !ok {
+		return "", fmt.Errorf("not an RSA public key")
+	}
+
+	// Convert to OpenSSH format
+	sshPub, err := ssh.NewPublicKey(pub)
+	if err != nil {
+		return "", fmt.Errorf("ssh key error: %w", err)
+	}
+
+	return string(ssh.MarshalAuthorizedKey(sshPub)), nil
+}
+
 func (c *ShadeformClient) GetInstance(ctx context.Context, instanceID v1.CloudProviderInstanceID) (*v1.Instance, error) {
 	authCtx := c.makeAuthContext(ctx)
 

v1/providers/shadeform/instancetype.go

@@ -154,7 +154,7 @@ func (c *ShadeformClient) convertShadeformInstanceTypeToV1InstanceType(shadeform
 
 	for _, region := range shadeformInstanceType.Availability {
 		instanceTypes = append(instanceTypes, v1.InstanceType{
-			// ID:     v1.InstanceTypeID(c.getInstanceTypeID(instanceType, region.Region)), // TODO: ID format is very particular within devplane, and will be generated automatically if omitted here
+			ID:     v1.InstanceTypeID(c.getInstanceTypeID(instanceType, region.Region)),
 			Type:   instanceType,
 			VCPU:   shadeformInstanceType.Configuration.Vcpus,
 			Memory: units.Base2Bytes(shadeformInstanceType.Configuration.MemoryInGb) * units.GiB,
@@ -171,7 +171,7 @@ func (c *ShadeformClient) convertShadeformInstanceTypeToV1InstanceType(shadeform
 			},
 			SupportedStorage: []v1.Storage{ // TODO: add storage
 				{
-					Type: "ssd",
+					Type:  "ssd",
 					Count: 1,
 					Size:  units.GiB * units.Base2Bytes(shadeformInstanceType.Configuration.StorageInGb),
 				},