Merge branch 'main' into registry

.github/workflows/build_and_deploy.yaml

@@ -64,6 +64,7 @@ jobs:
           '/certificates',
           '/terraform',
           '/registries',
+          "/copy"
         ]
 
     steps:

README.md

@@ -38,7 +38,7 @@ The following snippets are examples of things you can build with Jumppad, for mo
 
 ```hcl
 resource "network" "cloud" {
-  subnet = "10.5.0.0/16"
+  subnet = "10.5.0.0/24"
 }
 
 resource "k8s_cluster" "k3s" {
@@ -56,7 +56,7 @@ resource "k8s_cluster" "k3s" {
 }
 
 resource "k8s_config" "fake_service" {
-  cluster = resource.k8s_cluster.k3s.id
+  cluster = resource.k8s_cluster.k3s
 
   paths = ["./fake_service.yaml"]
 
@@ -67,7 +67,7 @@ resource "k8s_config" "fake_service" {
 }
 
 resource "helm" "vault" {
-  cluster = resource.k8s_cluster.k3s.id
+  cluster = resource.k8s_cluster.k3s
 
   repository {
     name = "hashicorp"
@@ -89,7 +89,7 @@ resource "ingress" "vault_http" {
   port = 18200
 
   target {
-    id   = resource.k8s_cluster.k3s.id
+    resource = resource.k8s_cluster.k3s
     port = 8200
 
     config = {
@@ -103,7 +103,7 @@ resource "ingress" "fake_service" {
   port = 19090
 
   target {
-    id   = resource.k8s_cluster.k3s.id
+    resource = resource.k8s_cluster.k3s
     port = 9090
 
     config = {
@@ -139,7 +139,7 @@ resource "nomad_cluster" "dev" {
 }
 
 resource "nomad_job" "example_1" {
-  cluster = resource.nomad_cluster.dev.id
+  cluster = resource.nomad_cluster.dev
 
   paths = ["./app_config/example1.nomad"]
 
@@ -153,7 +153,7 @@ resource "ingress" "fake_service_1" {
   port = 19090
 
   target {
-    id         = resource.nomad_cluster.dev.id
+    resource   = resource.nomad_cluster.dev
     named_port = "http"
 
     config = {

examples/copy/files/foo

@@ -0,0 +1 @@
+bar

examples/copy/main.hcl

@@ -0,0 +1,25 @@
+resource "copy" "local" {
+  source = "${dir()}/files/foo"
+  destination = "${data("copy")}/local"
+}
+
+resource "copy" "local_relative" {
+  source = "./files/foo"
+  destination = "${data("copy")}/local_relative"
+}
+
+
+resource "copy" "http" {
+  source = "https://www.foundanimals.org/wp-content/uploads/2023/02/twenty20_b4e89a76-af70-4567-b92a-9c3bbf335cb3.jpg"
+  destination = "${data("copy")}/http"
+}
+
+resource "copy" "git" {
+  source = "github.com/jumppad-labs/examples"
+  destination = "${data("copy")}/git"
+}
+
+resource "copy" "zip" {
+  source = "https://releases.hashicorp.com/nomad/1.6.3/nomad_1.6.3_linux_amd64.zip"
+  destination = "${data("copy")}/zip"
+}

examples/copy/test/copy.feature

@@ -0,0 +1,27 @@
+Feature: Copying files
+  In order to test copy capabilities
+  I should apply a blueprint
+  And check that the files have been copied
+
+  Scenario: Copy files from multiple sources
+    Given I have a running blueprint
+    When I run the script
+    ```
+    #!/bin/bash
+    if [ ! -f $HOME/.jumppad/data/copy/local/foo ]; then
+      exit 1
+    fi
+
+    if [ ! -f $HOME/.jumppad/data/copy/http/twenty20_b4e89a76-af70-4567-b92a-9c3bbf335cb3.jpg ]; then
+      exit 1
+    fi
+
+    if [ ! -f $HOME/.jumppad/data/copy/git/README.md ]; then
+      exit 1
+    fi
+
+    if [ ! -f $HOME/.jumppad/data/copy/zip/nomad ]; then
+      exit 1
+    fi
+    ```
+    Then I expect the exit code to be 0

examples/functions/container.hcl

@@ -37,5 +37,7 @@ resource "container" "consul" {
     cluster_api       = cluster_api("nomad_cluster.dc1")
     cluster_port      = cluster_port("nomad_cluster.dc1")
     var_len           = len(variable.test_var)
+    os                = system("os")
+    arch              = system("arch")   
   }
 }