From 073c2881a41052b0ab26f083ab5633089f748bad Mon Sep 17 00:00:00 2001
From: Robert Fratto <robertfratto@gmail.com>
Date: Mon, 25 Mar 2024 16:26:10 -0400
Subject: [PATCH] operations: rename river-jsonnet to alloy-syntax-jsonnet
 (#74)

---
 operations/alloy-syntax-jsonnet/README.md     | 65 +++++++++++++++++++
 .../builder.jsonnet                           |  6 +-
 .../internal/utils.jsonnet                    |  0
 .../jsonnetfile.json                          |  0
 .../main.libsonnet                            |  0
 .../main_test.jsonnet                         | 34 +++++-----
 .../manifest.jsonnet                          | 22 +++----
 operations/river-jsonnet/README.md            | 65 -------------------
 8 files changed, 96 insertions(+), 96 deletions(-)
 create mode 100644 operations/alloy-syntax-jsonnet/README.md
 rename operations/{river-jsonnet => alloy-syntax-jsonnet}/builder.jsonnet (74%)
 rename operations/{river-jsonnet => alloy-syntax-jsonnet}/internal/utils.jsonnet (100%)
 rename operations/{river-jsonnet => alloy-syntax-jsonnet}/jsonnetfile.json (100%)
 rename operations/{river-jsonnet => alloy-syntax-jsonnet}/main.libsonnet (100%)
 rename operations/{river-jsonnet => alloy-syntax-jsonnet}/main_test.jsonnet (79%)
 rename operations/{river-jsonnet => alloy-syntax-jsonnet}/manifest.jsonnet (90%)
 delete mode 100644 operations/river-jsonnet/README.md

diff --git a/operations/alloy-syntax-jsonnet/README.md b/operations/alloy-syntax-jsonnet/README.md
new file mode 100644
index 0000000000..b63ef8d8cd
--- /dev/null
+++ b/operations/alloy-syntax-jsonnet/README.md
@@ -0,0 +1,65 @@
+# `alloy-syntax-jsonnet` library
+
+The `alloy-syntax-jsonnet` library makes it possible to create Alloy syntax
+config files using Jsonnet.
+
+To manifest a configuration file, call `alloy.manifestAlloy(value)`.
+
+Field names from objects are expected to follow one of the three forms:
+
+* `<name>` for Alloy attributes (e.g., `foobar`).
+* `block <name>` for unlabeled Alloy blocks (e.g., `block exporter.unix`)
+* `block <name> <label>` for labeled Alloy blocks (.e.g, `block prometheus.remote_write default`).
+
+Instead of following these naming conventions, helper functions are provided to
+make it easier:
+
+* `alloy.attr(name)` returns a field name that can be used as an attribute.
+* `alloy.block(name, label="", index=0)` returns a field name that represents a block.
+  * The `index` parameter can be provided to make sure blocks get marshaled in
+    a specific order. If two blocks have the same index, they will be ordered
+    lexicographically by name and label.
+
+In addition to the helper functions, `alloy.expr(literal)` is used to inject a
+literal Alloy expression, so that `alloy.expr('env("HOME")')` is manifested as
+the literal Alloy expression `env("HOME")`.
+
+## Limitations
+
+* Manifested Alloy syntax files always have attributes and object keys in
+  lexicographic sort order, regardless of how they were defined in Jsonnet.
+* The resulting Alloy syntax files are not pretty-printed to how the formatter
+  would print files.
+
+## Example
+
+```jsonnet
+local alloy = import 'github.com/grafana/alloy/operations/alloy-syntax-jsonnet/main.libsonnet';
+
+alloy.manifestAlloy({
+  attr_1: "Hello, world!",
+
+  [alloy.block("some_block", "foobar")]: {
+    expr: alloy.expr('env("HOME")'),
+    inner_attr_1: [0, 1, 2, 3],
+    inner_attr_2: {
+      first_name: "John",
+      last_name: "Smith",
+    },
+  },
+})
+```
+
+results in
+
+```alloy
+attr_1 = "Hello, world"
+some_block "foobar" {
+  expr = env("HOME")
+  inner_attr_1 = [0, 1, 2, 3]
+  inner_attr_2 = {
+    "first_name" = "John",
+    "last_name" = "Smith",
+  }
+}
+```
diff --git a/operations/river-jsonnet/builder.jsonnet b/operations/alloy-syntax-jsonnet/builder.jsonnet
similarity index 74%
rename from operations/river-jsonnet/builder.jsonnet
rename to operations/alloy-syntax-jsonnet/builder.jsonnet
index 6e84bc4f9e..1a3dbd54a5 100644
--- a/operations/river-jsonnet/builder.jsonnet
+++ b/operations/alloy-syntax-jsonnet/builder.jsonnet
@@ -1,16 +1,16 @@
 local utils = import './internal/utils.jsonnet';
 
 {
-  // attr returns the field name that should be used for River attributes.
+  // attr returns the field name that should be used for Alloy attributes.
   attr(name):: name,
 
-  // block returns the field name that should be used for River blocks.
+  // block returns the field name that should be used for Alloy blocks.
   block(name, label='', index=0)::
     if label == ''
     then ('block %s %d' % [name, index])
     else ('block %s %s %d' % [name, label, index]),
 
-  // expr returns an object which represents a literal River expression.
+  // expr returns an object which represents a literal Alloy expression.
   expr(lit):: {
     // We need to use a special marker field to indicate that this object is an
     // expression, otherwise manifest.jsonnet would treat it as an object
diff --git a/operations/river-jsonnet/internal/utils.jsonnet b/operations/alloy-syntax-jsonnet/internal/utils.jsonnet
similarity index 100%
rename from operations/river-jsonnet/internal/utils.jsonnet
rename to operations/alloy-syntax-jsonnet/internal/utils.jsonnet
diff --git a/operations/river-jsonnet/jsonnetfile.json b/operations/alloy-syntax-jsonnet/jsonnetfile.json
similarity index 100%
rename from operations/river-jsonnet/jsonnetfile.json
rename to operations/alloy-syntax-jsonnet/jsonnetfile.json
diff --git a/operations/river-jsonnet/main.libsonnet b/operations/alloy-syntax-jsonnet/main.libsonnet
similarity index 100%
rename from operations/river-jsonnet/main.libsonnet
rename to operations/alloy-syntax-jsonnet/main.libsonnet
diff --git a/operations/river-jsonnet/main_test.jsonnet b/operations/alloy-syntax-jsonnet/main_test.jsonnet
similarity index 79%
rename from operations/river-jsonnet/main_test.jsonnet
rename to operations/alloy-syntax-jsonnet/main_test.jsonnet
index 114e76d8a7..9f79ba6222 100644
--- a/operations/river-jsonnet/main_test.jsonnet
+++ b/operations/alloy-syntax-jsonnet/main_test.jsonnet
@@ -1,4 +1,4 @@
-local river = import './main.libsonnet';
+local alloy = import './main.libsonnet';
 
 // The expectations below have to have sorted fields, since Jsonnet won't give
 // you the fields back in the original order.
@@ -27,7 +27,7 @@ local tests = [
   {
     name: 'Exprs',
     input: {
-      expr_attr: river.expr('prometheus.remote_write.default.receiver'),
+      expr_attr: alloy.expr('prometheus.remote_write.default.receiver'),
     },
     expect: |||
       expr_attr = prometheus.remote_write.default.receiver
@@ -36,11 +36,11 @@ local tests = [
   {
     name: 'Blocks',
     input: {
-      [river.block('labeled_block', 'foobar')]: {
+      [alloy.block('labeled_block', 'foobar')]: {
         attr_1: 15,
         attr_2: 30,
       },
-      [river.block('unlabeled_block')]: {
+      [alloy.block('unlabeled_block')]: {
         attr_1: 15,
         attr_2: 30,
       },
@@ -59,11 +59,11 @@ local tests = [
   {
     name: 'Ordered blocks',
     input: {
-      [river.block('labeled_block', 'foobar', index=1)]: {
+      [alloy.block('labeled_block', 'foobar', index=1)]: {
         attr_1: 15,
         attr_2: 30,
       },
-      [river.block('unlabeled_block', index=0)]: {
+      [alloy.block('unlabeled_block', index=0)]: {
         attr_1: 15,
         attr_2: 30,
       },
@@ -82,10 +82,10 @@ local tests = [
   {
     name: 'Nested blocks',
     input: {
-      [river.block('outer.block')]: {
+      [alloy.block('outer.block')]: {
         attr_1: 15,
         attr_2: 30,
-        [river.block('inner.block')]: {
+        [alloy.block('inner.block')]: {
           attr_3: 45,
           attr_4: 60,
         },
@@ -106,10 +106,10 @@ local tests = [
     name: 'Complex example',
     input: {
       attr_1: 'Hello, world!',
-      [river.block('some_block', 'foobar')]: {
+      [alloy.block('some_block', 'foobar')]: {
         attr_1: [0, 1, 2, 3],
         attr_2: { first_name: 'John', last_name: 'Smith' },
-        expr: river.expr('env("HOME")'),
+        expr: alloy.expr('env("HOME")'),
       },
     },
     expect: |||
@@ -129,13 +129,13 @@ local tests = [
     input: {
       attr_1: 'Hello, world!',
 
-      [river.block('outer_block')]: {
+      [alloy.block('outer_block')]: {
         attr_1: 53,
-        [river.block('inner_block', 'labeled')]: [
+        [alloy.block('inner_block', 'labeled')]: [
           { bool: true },
           { bool: false },
         ],
-        [river.block('inner_block', 'other_label')]: [
+        [alloy.block('inner_block', 'other_label')]: [
           { bool: true },
           { bool: false },
         ],
@@ -163,7 +163,7 @@ local tests = [
   {
     name: 'Indented literals',
     input: {
-      attr_1: river.expr('concat([%s])' % river.manifestRiverValue({ hello: 'world' })),
+      attr_1: alloy.expr('concat([%s])' % alloy.manifestAlloyValue({ hello: 'world' })),
     },
     expect: |||
       attr_1 = concat([{
@@ -174,7 +174,7 @@ local tests = [
   {
     name: 'Pruned expressions',
     input: std.prune({
-      expr: river.expr('env("HOME")'),
+      expr: alloy.expr('env("HOME")'),
     }),
     expect: |||
       expr = env("HOME")
@@ -183,7 +183,7 @@ local tests = [
 ];
 
 std.map(function(test) (
-  assert river.manifestRiver(test.input) == test.expect : (
+  assert alloy.manifestAlloy(test.input) == test.expect : (
     |||
       %s FAILED
 
@@ -194,7 +194,7 @@ std.map(function(test) (
       ACTUAL
       ======
       %s
-    ||| % [test.name, test.expect, river.manifestRiver(test.input)]
+    ||| % [test.name, test.expect, alloy.manifestAlloy(test.input)]
   );
   '%s: PASS' % test.name
 ), tests)
diff --git a/operations/river-jsonnet/manifest.jsonnet b/operations/alloy-syntax-jsonnet/manifest.jsonnet
similarity index 90%
rename from operations/river-jsonnet/manifest.jsonnet
rename to operations/alloy-syntax-jsonnet/manifest.jsonnet
index 429d35dba7..67d8c8dd5d 100644
--- a/operations/river-jsonnet/manifest.jsonnet
+++ b/operations/alloy-syntax-jsonnet/manifest.jsonnet
@@ -1,7 +1,7 @@
 local utils = import './internal/utils.jsonnet';
 
 // parseField parses a field name from a Jsonnet object and determines if it's
-// supposed to be a River attribute or block.
+// supposed to be an Alloy attribute or block.
 local parseField(name) = (
   local parts = std.split(name, ' ');
   local numParts = std.length(parts);
@@ -27,8 +27,8 @@ local parseField(name) = (
   )
 );
 
-// isRiverExpr returns true if value was constructed with river.expr().
-local isRiverExpr(value) = std.isObject(value) && std.length(value) == 1 && utils.exprMarker in value;
+// isAlloyExpr returns true if value was constructed with alloy.expr().
+local isAlloyExpr(value) = std.isObject(value) && std.length(value) == 1 && utils.exprMarker in value;
 
 // linePadding returns number of spaces to indent a line with given a specific
 // indentation level.
@@ -38,7 +38,7 @@ local manifester(indent=0) = {
   local padding = linePadding(indent),
   local this = $,
 
-  // body manifests a River body to text, manifesting both attributes and
+  // body manifests an Alloy body to text, manifesting both attributes and
   // blocks.
   body(value): (
     // First we need to look at each public field of the value and parse it as
@@ -88,11 +88,11 @@ local manifester(indent=0) = {
     ), parsedFields, '')
   ),
 
-  // value manifests a River value to text.
+  // value manifests an Alloy value to text.
   value(value): (
     if value == null then (
       'null'
-    ) else if isRiverExpr(value) then (
+    ) else if isAlloyExpr(value) then (
       local lines = std.split(value[utils.exprMarker], '\n');
 
       // When injecting literals, each line after the first should have the
@@ -162,14 +162,14 @@ local manifester(indent=0) = {
 
 {
 
-  // manifestRiver returns a pretty-printed River file from the Jsonnet value.
-  // value must be an object.
-  manifestRiver(value):: (
-    assert std.isObject(value) : 'manifestRiver must be called with object';
+  // manifestAlloy returns a pretty-printed Alloy syntax file from the Jsonnet
+  // value. value must be an object.
+  manifestAlloy(value):: (
+    assert std.isObject(value) : 'manifestAlloy must be called with object';
     manifester().body(value)
   ),
 
-  manifestRiverValue(value):: (
+  manifestAlloyValue(value):: (
     manifester().value(value)
   ),
 }
diff --git a/operations/river-jsonnet/README.md b/operations/river-jsonnet/README.md
deleted file mode 100644
index 3e5466c3f3..0000000000
--- a/operations/river-jsonnet/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# `river-jsonnet` library
-
-The `river-jsonnet` library makes it possible to return River-formatted config
-files using Jsonnet.
-
-To manifest a River configuration file, call `river.manifestRiver(value)`.
-
-Field names from objects are expected to follow one of the three forms:
-
-* `<name>` for River attributes (e.g., `foobar`).
-* `block <name>` for unlabeled River blocks (e.g., `block exporter.unix`)
-* `block <name> <label>` for labeled River blocks (.e.g, `block prometheus.remote_write default`).
-
-Instead of following these naming conventions, helper functions are provided to
-make it easier:
-
-* `river.attr(name)` returns a field name that can be used as an attribute.
-* `river.block(name, label="", index=0)` returns a field name that represents a block.
-  * The `index` parameter can be provided to make sure blocks get marshaled in
-    a specific order. If two blocks have the same index, they will be ordered
-    lexicographically by name and label.
-
-In addition to the helper functions, `river.expr(literal)` is used to inject a
-literal River expression, so that `river.expr('env("HOME")')` is manifested as
-the literal River expression `env("HOME")`.
-
-## Limitations
-
-* Manifested River files always have attributes and object keys in
-  lexicographic sort order, regardless of how they were defined in Jsonnet.
-* The resulting River files are not pretty-printed to how the formatter would
-  print files.
-
-## Example
-
-```jsonnet
-local river = import 'github.com/grafana/alloy/operations/river-jsonnet/main.libsonnet';
-
-river.manifestRiver({
-  attr_1: "Hello, world!",
-
-  [river.block("some_block", "foobar")]: {
-    expr: river.expr('env("HOME")'),
-    inner_attr_1: [0, 1, 2, 3],
-    inner_attr_2: {
-      first_name: "John",
-      last_name: "Smith",
-    },
-  },
-})
-```
-
-results in
-
-```river
-attr_1 = "Hello, world"
-some_block "foobar" {
-  expr = env("HOME")
-  inner_attr_1 = [0, 1, 2, 3]
-  inner_attr_2 = {
-    "first_name" = "John",
-    "last_name" = "Smith",
-  }
-}
-```