Release v1.0.1

.tools/nvim/__http__/console/logs-and-metrics.rest.yml

@@ -7,8 +7,8 @@ global:
   clusterName: "nova-303453"
   clusterNamespace: "kl-account-nova"
 
-  endTime:   '1700803914'
-  startTime: '1700717575'
+  endTime:   '1707205625'
+  startTime: '1707119214'
 ---
 
 label: Get Logs for App
@@ -27,8 +27,7 @@ query:
 label: Get Memory Metrics for App
 query:
   method: GET
-  # url: 'http://console-api.kl-core.svc.cluster.local:9100/observability/metrics/memory?workspace_name={{.workspaceName}}&start_time={{.startTime}}&end_time={{.endTime}}'
-  url: 'http://console-api.karthik-testing.svc.cluster.local:9100/observability/metrics/memory?cluster_name=sample-cluster&tracking_id=app-k-zmtg0km7epjj-fq89uvao14-3-l'
+  url: 'http://console-api.kloudlite.svc.cluster.local:9100/observability/metrics/memory?cluster_name=ab-cluster-3&tracking_id=app-3ez2fpr-3oc8gqjib-ii5-pbat6d&step=5m'
 
 ---
 

.tools/nvim/__http__/infra/vpn-devices.graphql.yml

@@ -2,8 +2,6 @@
 global:
   namespace: sample
   name: s1
-  namespace: sample-nxtcoder17
-  clusterName: sample-cluster2
 ---
 
 label: List VPN Devices
@@ -51,6 +49,34 @@ query: |+
     }
   }
 
+---
+label: "Get VPN Device"
+query: |+
+  query Core_getVPNDevices($name: String!) {
+    core_getVPNDevice(name: $name) {
+      displayName
+      metadata {
+        name
+        }
+        clusterName
+        projectName
+        spec {
+          activeNamespace
+          disabled
+          ports {
+            port
+            targetPort
+          }
+        }
+        wireguardConfig {
+          encoding
+          value
+        }
+      }
+  }
+variables:
+  name: "baby-589403"
+
 ---
 
 label: Create VPN Device

CHANGELOG.md

@@ -6,8 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.0.1] - 2024-02-07
+
+### Added
+
+- [apps/console] fixes managed resources created during environment cloning, `.spec.resourceName` is now generated differently for cloned environment
+- [apps/iam] fixes resolution of role `account-member` for actions `read-logs`, and `read-metrics`
+- [apps/infra] adds support for PV deletion
+- [apps/infra] fixes `getDevice` API. In case of unavailablity of wireguard config, it threw error, which caused [kloudlite/kl] to exit with non-zero code.
+
 ## [v1.0.0] - 2024-02-04
 
 ### Added 
 
 - [apps/infra] tenant clusters installation of `charts/kloudlite-agent` is now installed and managed by infra API. It is done to ensure that kloudlite can upgrade those releases, as new releases arrive
+
+[v1.0.1]: https://github.com/kloudlite/api/compare/v1.0.0...v1.0.1
+[kloudite/kl]: https://github.com/kloudlite/ki

apps/console/internal/app/app.go

@@ -2,8 +2,8 @@ package app
 
 import (
 	"context"
+	"fmt"
 	"net/http"
-	"strconv"
 	"time"
 
 	"github.com/kloudlite/api/pkg/errors"
@@ -22,7 +22,6 @@ import (
 	"github.com/kloudlite/api/constants"
 	"github.com/kloudlite/api/grpc-interfaces/kloudlite.io/rpc/iam"
 	"github.com/kloudlite/api/grpc-interfaces/kloudlite.io/rpc/infra"
-	fn "github.com/kloudlite/api/pkg/functions"
 	"github.com/kloudlite/api/pkg/grpc"
 	httpServer "github.com/kloudlite/api/pkg/http-server"
 	"github.com/kloudlite/api/pkg/kv"
@@ -94,12 +93,12 @@ var Module = fx.Module("app",
 
 				clusterName := c.Query("cluster_name")
 				if clusterName == "" {
-					return errors.New("query param (cluster_name) must be provided")
+					return c.Status(http.StatusBadRequest).JSON(map[string]any{"error": "query param (cluster_name) must be provided"})
 				}
 
 				trackingId := c.Query("tracking_id")
 				if trackingId == "" {
-					return errors.New("query param (tracking_id) must be provided")
+					return c.Status(http.StatusBadRequest).JSON(map[string]any{"error": "query param (tracking_id) must be provided"})
 				}
 
 				can, err := iamCli.Can(c.Context(), &iam.CanIn{
@@ -114,38 +113,20 @@ var Module = fx.Module("app",
 				}
 
 				if !can.Status {
-					return &fiber.Error{Code: http.StatusUnauthorized, Message: errors.NewEf(err, "unauthorized to view metrics for resources belonging to account (%s)", cc.AccountName).Error()}
+					return &fiber.Error{Code: http.StatusUnauthorized, Message: fmt.Sprintf("unauthorized to view metrics for resources belonging to account (%s)", cc.AccountName)}
 				}
 
 				metricType := c.Params("metric_type")
 
-				st := c.Query("start_time")
-				et := c.Query("end_time")
-
-				var startTime *time.Time
-				var endTime *time.Time
-
-				if st != "" {
-					st, err := strconv.ParseInt(st, 10, 64)
-					if err != nil {
-						return errors.NewE(err)
-					}
-					startTime = fn.New(time.Unix(st, 0))
-				}
-
-				if et != "" {
-					et, err := strconv.ParseInt(et, 10, 64)
-					if err != nil {
-						return errors.NewE(err)
-					}
-					endTime = fn.New(time.Unix(et, 0))
-				}
+				st := c.Query("start_time", fmt.Sprintf("%d", time.Now().Add(-3*time.Hour).Unix()))
+				et := c.Query("end_time", fmt.Sprintf("%d", time.Now().Unix()))
+				step := c.Query("step", "5m")
 
 				return queryProm(ev.PromHttpAddr, PromMetricsType(metricType), map[string]string{
 					"kl_account_name": cc.AccountName,
 					"kl_cluster_name": clusterName,
 					"kl_tracking_id":  trackingId,
-				}, startTime, endTime, c.Response().BodyWriter())
+				}, st, et, step, c.Response().BodyWriter())
 			})
 		},
 	),

apps/console/internal/app/observability-handler.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/kloudlite/api/pkg/errors"
-	fn "github.com/kloudlite/api/pkg/functions"
 )
 
 type ObservabilityArgs struct {
@@ -109,10 +108,9 @@ func buildPromQuery(resType PromMetricsType, filters map[string]string) (string,
 	default:
 		return "", errors.New("unknown prom metrics type provided")
 	}
-
 }
 
-func queryProm(promAddr string, resType PromMetricsType, filters map[string]string, startTime *time.Time, endTime *time.Time, writer io.Writer) error {
+func queryProm(promAddr string, resType PromMetricsType, filters map[string]string, startTime string, endTime string, step string, writer io.Writer) error {
 	promQuery, err := buildPromQuery(resType, filters)
 	if err != nil {
 		return errors.NewE(err)
@@ -128,18 +126,9 @@ func queryProm(promAddr string, resType PromMetricsType, filters map[string]stri
 	qp := u.Query()
 	qp.Add("query", promQuery)
 
-	t := time.Now()
-	if startTime == nil {
-		startTime = fn.New(t.Add(-2 * 24 * time.Hour))
-	}
-	if endTime == nil {
-		endTime = &t
-	}
-
-	qp.Add("start", fmt.Sprintf("%d", startTime.Unix()))
-	qp.Add("end", fmt.Sprintf("%d", endTime.Unix()))
-	// qp.Add("step", "700") // 15 minute
-	qp.Add("step", "345") // 15 minute
+	qp.Add("start", startTime)
+	qp.Add("end", endTime)
+	qp.Add("step", step)
 
 	u.RawQuery = qp.Encode()
 
@@ -148,7 +137,7 @@ func queryProm(promAddr string, resType PromMetricsType, filters map[string]stri
 		return errors.NewE(err)
 	}
 
-	// fmt.Printf("[DEBUG]: prometheus actual request: %s\n", req.URL.String())
+	fmt.Printf("[DEBUG]: prometheus actual request: %s\n", req.URL.String())
 
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {

apps/console/internal/domain/environment.go

@@ -187,7 +187,7 @@ func (d *domain) CloneEnvironment(ctx ConsoleContext, projectName string, source
 			},
 			Spec: crdsv1.EnvironmentSpec{
 				ProjectName:     projectName,
-				TargetNamespace: fmt.Sprintf("env-%s", destinationEnvName),
+				TargetNamespace: d.getEnvironmentTargetNamespace(projectName, destinationEnvName),
 				Routing: &crdsv1.EnvironmentRouting{
 					Mode: envRoutingMode,
 				},
@@ -215,6 +215,15 @@ func (d *domain) CloneEnvironment(ctx ConsoleContext, projectName string, source
 		return nil, errors.NewE(err)
 	}
 
+	if _, err := d.iamClient.AddMembership(ctx, &iam.AddMembershipIn{
+		UserId:       string(ctx.UserId),
+		ResourceType: string(iamT.ResourceEnvironment),
+		ResourceRef:  iamT.NewResourceRef(ctx.AccountName, iamT.ResourceEnvironment, destEnv.Spec.TargetNamespace),
+		Role:         string(iamT.RoleResourceOwner),
+	}); err != nil {
+		d.logger.Errorf(err, "error while adding membership")
+	}
+
 	destEnv, err = d.environmentRepo.Create(ctx, destEnv)
 	if err != nil {
 		return nil, errors.NewE(err)
@@ -224,6 +233,15 @@ func (d *domain) CloneEnvironment(ctx ConsoleContext, projectName string, source
 		return nil, errors.NewE(err)
 	}
 
+	if err := d.applyK8sResource(ctx, sourceEnv.ProjectName, &corev1.Namespace{
+		TypeMeta: metav1.TypeMeta{APIVersion: "v1", Kind: "Namespace"},
+		ObjectMeta: metav1.ObjectMeta{
+			Name: destEnv.Spec.TargetNamespace,
+		},
+	}, destEnv.RecordVersion); err != nil {
+		return nil, errors.NewE(err)
+	}
+
 	if err := d.applyK8sResource(ctx, sourceEnv.ProjectName, &destEnv.Environment, destEnv.RecordVersion); err != nil {
 		return nil, errors.NewE(err)
 	}
@@ -279,7 +297,7 @@ func (d *domain) CloneEnvironment(ctx ConsoleContext, projectName string, source
 
 	resourceMetadata := func(dn string) common.ResourceMetadata {
 		return common.ResourceMetadata{
-			DisplayName: fmt.Sprintf("clone of %s", dn),
+			DisplayName: dn,
 			CreatedBy: common.CreatedOrUpdatedBy{
 				UserId:    ctx.UserId,
 				UserName:  ctx.UserName,
@@ -370,11 +388,13 @@ func (d *domain) CloneEnvironment(ctx ConsoleContext, projectName string, source
 	}
 
 	for i := range managedResources {
+		spec := managedResources[i].Spec
+		spec.ResourceName = genMresResourceName(destEnv.Name, managedResources[i].Name)
 		if _, err := d.createAndApplyManagedResource(resCtx, &entities.ManagedResource{
 			ManagedResource: crdsv1.ManagedResource{
 				TypeMeta:   managedResources[i].TypeMeta,
 				ObjectMeta: objectMeta(managedResources[i].ObjectMeta, destEnv.Spec.TargetNamespace),
-				Spec:       managedResources[i].Spec,
+				Spec:       spec,
 				Enabled:    managedResources[i].Enabled,
 			},
 			AccountName:      ctx.AccountName,
@@ -386,15 +406,6 @@ func (d *domain) CloneEnvironment(ctx ConsoleContext, projectName string, source
 		}
 	}
 
-	if _, err := d.iamClient.AddMembership(ctx, &iam.AddMembershipIn{
-		UserId:       string(ctx.UserId),
-		ResourceType: string(iamT.ResourceEnvironment),
-		ResourceRef:  iamT.NewResourceRef(ctx.AccountName, iamT.ResourceEnvironment, destEnv.Spec.TargetNamespace),
-		Role:         string(iamT.RoleResourceOwner),
-	}); err != nil {
-		d.logger.Errorf(err, "error while adding membership")
-	}
-
 	return destEnv, nil
 }
 

apps/console/internal/domain/mres.go

@@ -154,11 +154,15 @@ func (d *domain) CreateManagedResource(ctx ResourceContext, mres entities.Manage
 	mres.ProjectName = ctx.ProjectName
 	mres.EnvironmentName = ctx.EnvironmentName
 
-	mres.Spec.ResourceName = fmt.Sprintf("env-%s-%s", ctx.EnvironmentName, mres.Name)
+	mres.Spec.ResourceName = genMresResourceName(ctx.EnvironmentName, mres.Name)
 
 	return d.createAndApplyManagedResource(ctx, &mres)
 }
 
+func genMresResourceName(envName string, mresName string) string {
+	return fmt.Sprintf("env-%s-%s", envName, mresName)
+}
+
 func (d *domain) createAndApplyManagedResource(ctx ResourceContext, mres *entities.ManagedResource) (*entities.ManagedResource, error) {
 	mres.SyncStatus = t.GenSyncStatus(t.SyncActionApply, 0)
 

apps/console/internal/domain/vpn-device.go

@@ -113,11 +113,11 @@ func (d *domain) GetVPNDevice(ctx ConsoleContext, name string) (*entities.Consol
 
 	clusterName, err := d.getClusterFromDevice(ctx, device)
 	if err != nil {
-		return nil, errors.NewE(err)
+		return device, nil
 	}
 
 	if device.WireguardConfigs == nil || device.WireguardConfigs[clusterName].Value == "" {
-		return nil, errors.Newf("no wireguard configs found")
+		return device, nil
 	}
 
 	device.WireguardConfig = device.WireguardConfigs[clusterName]