cisagov
diff --git a/‎.devcontainer/python_development/devcontainer.json
Lines changed: 4 additions & 0 deletions b/‎.devcontainer/python_development/devcontainer.json
Lines changed: 4 additions & 0 deletions
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 5 additions & 0 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 5 additions & 0 deletions
diff --git a/‎.github/workflows/cluster.yml
Lines changed: 10 additions & 0 deletions b/‎.github/workflows/cluster.yml
Lines changed: 10 additions & 0 deletions
diff --git a/‎.github/workflows/linux_only.yml
Lines changed: 15 additions & 1 deletion b/‎.github/workflows/linux_only.yml
Lines changed: 15 additions & 1 deletion
diff --git a/‎.gitignore
Lines changed: 3 additions & 0 deletions b/‎.gitignore
Lines changed: 3 additions & 0 deletions
diff --git a/‎testing/InstallTestbed.ps1
Lines changed: 14 additions & 1 deletion b/‎testing/InstallTestbed.ps1
Lines changed: 14 additions & 1 deletion
diff --git a/‎testing/SetupTestbed.ps1
Lines changed: 31 additions & 0 deletions b/‎testing/SetupTestbed.ps1
Lines changed: 31 additions & 0 deletions
diff --git a/‎testing/configure/lib/functions.sh
Lines changed: 34 additions & 1 deletion b/‎testing/configure/lib/functions.sh
Lines changed: 34 additions & 1 deletion
diff --git a/‎testing/configure/linux_install_lme.exp
Lines changed: 11 additions & 0 deletions b/‎testing/configure/linux_install_lme.exp
Lines changed: 11 additions & 0 deletions
diff --git a/‎testing/configure/linux_install_lme.sh
Lines changed: 6 additions & 0 deletions b/‎testing/configure/linux_install_lme.sh
Lines changed: 6 additions & 0 deletions
diff --git a/‎testing/development/Dockerfile
Lines changed: 14 additions & 0 deletions b/‎testing/development/Dockerfile
Lines changed: 14 additions & 0 deletions
diff --git a/‎testing/development/build_docker_lme_install.sh
Lines changed: 14 additions & 1 deletion b/‎testing/development/build_docker_lme_install.sh
Lines changed: 14 additions & 1 deletion
@@ -14,6 +14,10 @@
         "ms-python.black-formatter"
       ]
     }
+<<<<<<< HEAD
   },
   "remoteUser": "admin.ackbar"
+=======
+  }
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
 }
@@ -25,7 +25,12 @@
 - [ ] There is a [gitIssue](https://github.com/cisagov/LME/issues) that this PR resolves
 - [ ] The PR's base branch has been modified to be the proper branch. 
 - [ ] Changes are limited to a single goal **AND** 
+<<<<<<< HEAD
       the title reflects this in a clear human readable format for the release notes
+=======
+      the title reflects this in a clear human readable format
+- [ ] Issue that this PR solves has been selected in the Development section
+>>>>>>> 34b2ff9 (Update PULL_REQUEST_TEMPLATE.md (#206))
 - [ ] I have read and agree to LME's [CONTRIBUTING.md](https://github.com/cisagov/LME/CONTRIBUTING.md) document.
 - [ ] The PR adheres to LME's requirements in [RELEASES.md](https://github.com/cisagov/LME/RELEASES.md#steps-to-submit-a-PR)
 - [ ] These code changes follow [cisagov code standards](https://github.com/cisagov/development-guide).
 
@@ -2,6 +2,7 @@ name: Cluster Run
 
 on:
   workflow_dispatch:
+<<<<<<< HEAD
   # pull_request:
   #  branches:
   #    - '*'
@@ -276,3 +277,12 @@ jobs:
           }"
           docker compose -p ${{ env.UNIQUE_ID }} down
           docker system prune --force
+=======
+jobs:
+  manual-job:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Greet
+        run: echo "This is a manually triggered workflow."
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 name: Linux Only
 
 on:
@@ -120,4 +121,17 @@ jobs:
         cd testing/development
         docker compose -p ${{ env.UNIQUE_ID }} exec -T -u root lme bash -c "rm -rf /home/admin.ackbar/LME/.pytest_cache"
         docker compose -p ${{ env.UNIQUE_ID }} down
-        docker system prune -a --force
+        docker system prune -a --force
+=======
+name: Linux Only 
+
+on:
+  workflow_dispatch:
+jobs:
+  manual-job:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Greet
+        run: echo "This is a manually triggered workflow."
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
@@ -26,5 +26,8 @@ lme_update.sh
 /testing/*.output.log
 /testing/tests/report.html
 testing/tests/assets/style.css
+<<<<<<< HEAD
 .history/
 **/get-docker.sh
+=======
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
@@ -28,7 +28,10 @@ param (
 # If you were to need the password from the SetupTestbed.ps1 script, you could use this:
 # $Password = Get-Content "${ResourceGroup}.password.txt"
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
 $ProcessSeparator = "`n----------------------------------------`n"
 
 # Define our library path
@@ -255,8 +258,14 @@ $getElasticsearchPasswordsResponse = az vm run-command invoke `
   --command-id RunShellScript `
   --name $LinuxVM `
   --resource-group $ResourceGroup `
+<<<<<<< HEAD
   --scripts 'sed -n "/^## elastic/,/^####################/p" "/opt/lme/Chapter 3 Files/output.log"'  
 
+=======
+  --scripts 'tail -n14 "/opt/lme/Chapter 3 Files/output.log" | head -n9'
+
+# Show-FormattedOutput -FormattedOutput (Format-AzVmRunCommandOutput -JsonResponse "$getElasticsearchPasswordsResponse")
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
 Write-Output $ProcessSeparator
 
 if (-Not $LinuxOnly){
@@ -383,6 +392,7 @@ $EsPasswords
 
 # Write the passwords to a file
 $PasswordPath = "..\..\${ResourceGroup}.password.txt"
+<<<<<<< HEAD
 $EsPasswords | Out-File -Append -FilePath $PasswordPath
 
 # Constructing a string that will hold all the command-line parameters to be written to the file
@@ -399,4 +409,7 @@ Branch: $Branch
 # Output the parameters to the end of the password file
 $paramsToWrite | Out-File -Append -FilePath $PasswordPath
 
-Get-Content -Path $PasswordPath
+Get-Content -Path $PasswordPath
+=======
+$EsPasswords | Out-File -Append -FilePath $PasswordPath
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
@@ -74,7 +74,11 @@ if (Test-Path -Path $libraryPath) {
     . $libraryPath
 }
 else {
+<<<<<<< HEAD
     Write-Error "Library script not found at path: $libraryPathCreating Network Port 22 rule..."
+=======
+    Write-Error "Library script not found at path: $libraryPath"
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
 }
 
 
@@ -166,6 +170,7 @@ function Set-NetworkRules {
         $priority = $Priorities[$i]
         $protocol = $Protocols[$i]
         Write-Output "`nCreating Network Port $port rule..."
+<<<<<<< HEAD
         $command = "az network nsg rule create --name Network_Port_Rule_$port " +
             "--resource-group $ResourceGroup " +
             "--nsg-name NSG1 " +
@@ -183,6 +188,21 @@ function Set-NetworkRules {
         $networkRuleResponse = Invoke-Expression $command
         Write-Output $networkRuleResponse
 
+=======
+
+        $networkRuleResponse = az network nsg rule create --name Network_Port_Rule_$port `
+            --resource-group $ResourceGroup `
+            --nsg-name NSG1 `
+            --priority $priority `
+            --direction Inbound `
+            --access Allow `
+            --protocol $protocol `
+            --source-address-prefixes $AllowedSourcesList `
+            --destination-address-prefixes '*' `
+            --destination-port-ranges $port `
+            --description "Allow inbound from $sources on $port via $protocol connections."
+        Write-Output $networkRuleResponse
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
     }
 }
 
@@ -432,7 +452,11 @@ if (-Not $LinuxOnly){
     Add-DnsServerResourceRecordA -Name LS1 -ZoneName $DomainName. -AllowUpdateAny -IPv4Address $LsIP -TimeToLive 01:00:00 -AsJob
 }
 `$job = Start-Job -ScriptBlock `$scriptBlock
+<<<<<<< HEAD
 `$timeout = 120 
+=======
+`$timeout = 90
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
 if (Wait-Job -Job `$job -Timeout `$timeout) {
     Receive-Job -Job `$job
     Write-Host 'The script completed within the timeout period.'
@@ -457,6 +481,10 @@ if (Wait-Job -Job `$job -Timeout `$timeout) {
         --scripts "Set-Content -Path 'C:\AddDnsRecord.ps1' -Value ([System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String('$encodedScript')))"
     Show-FormattedOutput -FormattedOutput (Format-AzVmRunCommandOutput -JsonResponse "$createDnsScriptResponse")
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
     Write-Output "`nRunning script to add DNS entry for Linux server. It could time out or not. Check output of the next command..."
     $addDnsRecordResponse = az vm run-command invoke `
         --command-id RunPowerShellScript `
@@ -465,6 +493,7 @@ if (Wait-Job -Job `$job -Timeout `$timeout) {
         --scripts "C:\AddDnsRecord.ps1"
     Show-FormattedOutput -FormattedOutput (Format-AzVmRunCommandOutput -JsonResponse "$addDnsRecordResponse")
 
+<<<<<<< HEAD
     Write-Output "`nAdding ls1 to hosts file..."
     $writeToHostsFileResponse = az vm run-command invoke `
     --command-id RunPowerShellScript `
@@ -473,6 +502,8 @@ if (Wait-Job -Job `$job -Timeout `$timeout) {
     --scripts "Add-Content -Path 'C:\windows\system32\drivers\etc\hosts' -Value '$LsIP ls1.$DomainName ls1'"
     Show-FormattedOutput -FormattedOutput (Format-AzVmRunCommandOutput -JsonResponse "$writeToHostsFileResponse")
 
+=======
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
     Write-Host "Checking if ls1 resolves. This should resolve to ls1.lme.local->${LsIP}, not another domain..."
     $resolveLs1Response = az vm run-command invoke `
         --command-id RunPowerShellScript `
 
@@ -1,4 +1,5 @@
 extract_credentials() {
+<<<<<<< HEAD
   local file_path=${1:-'/opt/lme/Chapter 3 Files/output.log'}
 
   if [ ! -f "$file_path" ]; then
@@ -44,4 +45,36 @@ extract_ls1_ip() {
     fi
     publicIpAddress=$(sed -n '/Creating LS1.../,/}/p' $file_path | awk -F'"' '/publicIpAddress/{print $4}')
     export LS1_IP=$publicIpAddress
-}
+}
+=======
+    # Set default file path if not provided
+    local file_path=${1:-'/opt/lme/Chapter 3 Files/output.log'}
+
+    # Check if the file exists
+    if [ ! -f "$file_path" ]; then
+        echo "File not found: $file_path"
+        return 1
+    fi
+
+    # Read and extract credentials from the last 18 lines
+    while IFS= read -r line; do
+        # Remove leading '## ' and trim whitespaces from the line
+        line=$(echo "$line" | sed 's/^## //g' | xargs)
+
+        # Split the line into key and value
+        key=$(echo "$line" | awk -F ':' '{print $1}')
+        value=$(echo "$line" | awk -F ':' '{print $2}' | xargs)  # xargs to trim whitespaces from value
+
+        # Remove non-word characters (keep only word characters)
+        value=$(echo "$value" | sed 's/[^[:alnum:]_]//g')
+
+        case $key in
+            "elastic") export elastic=$value ;;
+            "kibana") export kibana=$value ;;
+            "logstash_system") export logstash_system=$value ;;
+            "logstash_writer") export logstash_writer=$value ;;
+            "dashboard_update") export dashboard_update=$value ;;
+        esac
+    done < <(tail -n 18 "$file_path" | grep -E "(elastic|kibana|logstash_system|logstash_writer|dashboard_update):")
+}
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
@@ -39,11 +39,16 @@ send "ls1.lme.local\r"
 
 sleep 1
 
+<<<<<<< HEAD
 expect -re {.*ntinue with self signed certificates.*: y}
+=======
+expect -re {continue with self signed certificates.*: y}
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
 sleep 1
 send "\r"
 sleep 1
 
+<<<<<<< HEAD
 expect -re {.*ip Docker Install\? \(\[y\]es/\[n\]o\): n}
 sleep 1
 send "\r"
@@ -73,6 +78,12 @@ expect {
         exp_continue
     }
 }
+=======
+expect -re {Skip Docker Install\? \(\[y\]es/\[n\]o\): n}
+sleep 1
+send "\r"
+set timeout 600
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
 
 expect eof
 
 
@@ -63,11 +63,14 @@ else
   sudo mv "$extracted_filename" /opt/lme
 fi
 
+<<<<<<< HEAD
 # Change the way we check disk usage in the old versions
 perl -pi -e 's/DISK_SIZE="\$\(echo "\$DF_OUTPUT".+?\)"/DISK_SIZE=130/' /opt/lme/Chapter\ 3\ Files/deploy.sh
 perl -pi -e 's/DISK_80=\$\(\(DISK_SIZE_ROUND \* 80 \/ 100\)\)/DISK_80=91/g' /opt/lme/Chapter\ 3\ Files/deploy.sh
 
 
+=======
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
 echo 'export DEBIAN_FRONTEND=noninteractive' >> ~/.bashrc
 echo 'export NEEDRESTART_MODE=a' >> ~/.bashrc
 . ~/.bashrc
@@ -76,6 +79,7 @@ echo 'export NEEDRESTART_MODE=a' >> ~/.bashrc
 echo 'export DEBIAN_FRONTEND=noninteractive' | sudo tee -a /root/.bashrc
 echo 'export NEEDRESTART_MODE=a' | sudo tee -a /root/.bashrc
 
+<<<<<<< HEAD
 #get interface name of default route
 DEFAULT_IF="$(route | grep '^default' | grep -o '[^ ]*$')"
 
@@ -97,6 +101,8 @@ installdocker
 echo -e "\e[32m[X]\e[0m Pulling the images. This may take some time."
 docker compose -f /opt/lme/Chapter\ 3\ Files/docker-compose-stack.yml pull --quiet
 
+=======
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
 # Execute script with root privileges
 # Todo: We could put a switch here for different versions and just run different expect scripts
 sudo -E bash -c  ". /root/.bashrc && $script_dir/linux_install_lme.exp"
 
@@ -1,7 +1,10 @@
 # Use Ubuntu 22.04 as base image
 FROM ubuntu:22.04
+<<<<<<< HEAD
 ARG USER_ID=1001
 ARG GROUP_ID=1001
+=======
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
 
 # Set environment variable to avoid interactive dialogues during build
 ENV DEBIAN_FRONTEND=noninteractive
@@ -17,18 +20,22 @@ RUN apt-get update && apt-get install -y \
     curl \
     wget \
     sudo \
+<<<<<<< HEAD
     cron \
     freerdp2-x11 \
     pkg-config \
     libcairo2-dev \
     libdbus-1-dev \
     distro-info \
     libgirepository1.0-dev \
+=======
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
     && wget -q "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" \
     && dpkg -i packages-microsoft-prod.deb \
     && apt-get update \
     && apt-get install -y powershell \
     && rm -rf /var/lib/apt/lists/* \
+<<<<<<< HEAD
     && curl -sL https://aka.ms/InstallAzureCLIDeb | bash \
     && wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
     && apt install -y ./google-chrome-stable_current_amd64.deb \
@@ -41,6 +48,13 @@ RUN apt-get update && apt-get install -y \
 # Create a user and group 'admin.ackbar' with GID 1001
 RUN groupadd -g $GROUP_ID admin.ackbar \
     && useradd -m -u $USER_ID -g admin.ackbar --badnames admin.ackbar \
+=======
+    && curl -sL https://aka.ms/InstallAzureCLIDeb | bash
+
+# Create a user and group 'admin.ackbar' with GID 1001
+RUN groupadd -g 1001 admin.ackbar \
+    && useradd -m -u 1001 -g admin.ackbar --badnames admin.ackbar \
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
     && usermod -aG sudo admin.ackbar
 
 # Allow 'admin.ackbar' user to run sudo commands without a password
 
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+<<<<<<< HEAD
 
 # Parse command line arguments
 while getopts ":b:v:" opt; do
@@ -43,4 +44,16 @@ cd ../tests/ || exit
 python3 -m venv /home/admin.ackbar/venv_test
 . /home/admin.ackbar/venv_test/bin/activate
 pip install -r requirements.txt
-sudo chown admin.ackbar:admin.ackbar /home/admin.ackbar/venv_test -R
+sudo chown admin.ackbar:admin.ackbar /home/admin.ackbar/venv_test -R
+=======
+cd testing/configure || exit
+sudo ./linux_update_system.sh
+sudo ./linux_install_lme.sh -b cbaxley-168-python_tests
+. lib/functions.sh
+extract_credentials
+cd ../tests/ || exit
+python3 -m venv ~/venv_test
+. ~/venv_test/bin/activate
+pip install -r requirements.txt
+#pytest api_tests/linux_only/
+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@`
`14`	`14`	`"ms-python.black-formatter"`
`15`	`15`	`]`
`16`	`16`	`}`
	`17`	`+<<<<<<< HEAD`
`17`	`18`	`},`
`18`	`19`	`"remoteUser": "admin.ackbar"`
	`20`	`+=======`
	`21`	`+ }`
	`22`	`+>>>>>>> 450e17d (Rebase latest changes from main into release-1.4.0 (#222))`
`19`	`23`	`}`