Merge pull request #18266 from Valinwolf/develop

Added endpoint & use_path_style_endpoint configs for public/private S3

.env.dev.docker

@@ -137,6 +137,8 @@ PUBLIC_AWS_ACCESS_KEY_ID=null
 PUBLIC_AWS_DEFAULT_REGION=null
 PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
+PUBLIC_AWS_ENDPOINT=null
+PUBLIC_AWS_PATH_STYLE=null
 PUBLIC_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------
@@ -147,6 +149,8 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=null
 PRIVATE_AWS_DEFAULT_REGION=null
 PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
+PRIVATE_AWS_ENDPOINT=null
+PRIVATE_AWS_PATH_STYLE=null
 PRIVATE_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------

.env.docker

@@ -144,6 +144,8 @@ PUBLIC_AWS_ACCESS_KEY_ID=null
 PUBLIC_AWS_DEFAULT_REGION=null
 PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
+PUBLIC_AWS_ENDPOINT=null
+PUBLIC_AWS_PATH_STYLE=null
 PUBLIC_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------
@@ -154,6 +156,8 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=null
 PRIVATE_AWS_DEFAULT_REGION=null
 PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
+PRIVATE_AWS_ENDPOINT=null
+PRIVATE_AWS_PATH_STYLE=null
 PRIVATE_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------

.env.example

@@ -143,6 +143,8 @@ PUBLIC_AWS_ACCESS_KEY_ID=null
 PUBLIC_AWS_DEFAULT_REGION=null
 PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
+PUBLIC_AWS_ENDPOINT=null
+PUBLIC_AWS_PATH_STYLE=null
 PUBLIC_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------
@@ -153,6 +155,8 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=null
 PRIVATE_AWS_DEFAULT_REGION=null
 PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
+PRIVATE_AWS_ENDPOINT=null
+PRIVATE_AWS_PATH_STYLE=null
 PRIVATE_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------

README.md

@@ -83,6 +83,7 @@ Since the release of the JSON REST API, several third-party developers have been
 - [jamf2snipe](https://github.com/grokability/jamf2snipe) - Python script to sync assets between a JAMFPro instance and a Snipe-IT instance
 - [jamf-snipe-rename](https://macblog.org/jamf-snipe-rename/) - Python script to rename computers in Jamf from Snipe-IT
 - [Snipe-IT plugin for Jira Service Desk](https://marketplace.atlassian.com/apps/1220964/snipe-it-for-jira)
+- [Rudder2Snipe](https://github.com/norbertoaquino/rudder2snipe) by [@norbertoaquino](https://github.com/norbertoaquino) - Rudder.io integration for Snipe-IT
 - [Python 3 CSV importer](https://github.com/gastamper/snipeit-csvimporter) - allows importing assets into Snipe-IT based on Item Name rather than Asset Tag.
 - [Snipe-IT Kubernetes Helm Chart](https://github.com/t3n/helm-charts/tree/master/snipeit) - For more information, [click here](https://hub.helm.sh/charts/t3n/snipeit).
 - [Snipe-IT Bulk Edit](https://github.com/bricelabelle/snipe-it-bulkedit) - Google Script files to use Google Sheets as a bulk checkout/checkin/edit tool for Snipe-IT.

app/Http/Controllers/Api/ComponentsController.php

@@ -58,8 +58,8 @@ class ComponentsController extends Controller
             ];
 
         $components = Component::select('components.*')
-            ->with('company', 'location', 'category', 'assets', 'supplier', 'adminuser', 'manufacturer', 'uncontrainedAssets')
-            ->withSum('uncontrainedAssets', 'components_assets.assigned_qty');
+            ->with('company', 'location', 'category', 'supplier', 'adminuser', 'manufacturer')
+            ->withSum('uncontrainedAssets as sum_unconstrained_assets', 'components_assets.assigned_qty');
 
         $filter = [];
 
@@ -112,7 +112,8 @@ class ComponentsController extends Controller
         }
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $components->count()) ? $components->count() : app('api_offset_value');
+        $components_count = $components->count();
+        $offset = ($request->input('offset') > $components_count) ? $components_count : app('api_offset_value');
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -143,7 +144,7 @@ class ComponentsController extends Controller
                 break;
         }
 
-        $total = $components->count();
+        $total = $components_count;
         $components = $components->skip($offset)->take($limit)->get();
 
         return (new ComponentsTransformer)->transformComponents($components, $total);

app/Http/Controllers/Api/LocationsController.php

@@ -242,6 +242,7 @@ class LocationsController extends Controller
                 'locations.currency',
                 'locations.company_id',
                 'locations.notes',
+                'locations.tag_color',
             ])
             ->withCount('assignedAssets as assigned_assets_count')
             ->withCount('assets as assets_count')

app/Models/Component.php

@@ -238,14 +238,26 @@ class Component extends SnipeModel
      * @since  [v5.0]
      * @return int
      */
-    public function numCheckedOut()
+    public function numCheckedOut(bool $recalculate = false)
     {
-        $checkedout = 0;
+        /**
+         *
+         * WARNING: This method caches the result, so if you're doing something
+         * that is going to change the number of checked-out items, make sure to pass
+         * 'true' as the first parameter to force this to recalculate the number of checked-out
+         * items!!!!!
+         *
+         */
 
         // In case there are elements checked out to assets that belong to a different company
         // than this asset and full multiple company support is on we'll remove the global scope,
         // so they are included in the count.
-        return $this->uncontrainedAssets->sum('pivot.assigned_qty');
+        if (is_null($this->sum_unconstrained_assets) || $recalculate) {
+            // This, in a components-listing context, is mostly important for when it sets a 'zero' which
+            // is *not* null - so we don't have to keep recalculating for un-checked-out components
+            $this->sum_unconstrained_assets = $this->uncontrainedAssets()->sum('assigned_qty') ?? 0;
+        }
+        return $this->sum_unconstrained_assets;
     }
 
 

app/Models/Labels/Sheets/Avery/L4736_A.php

@@ -95,23 +95,39 @@ class L4736_A extends L4736
             $currentX += $barcodeSize + self::BARCODE_MARGIN;
             $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
         }
+        $fields = $record->get('fields');
+        $fieldCount = count($fields);
 
-        foreach ($record->get('fields') as $field) {
+        $perFieldHeight = (self::LABEL_SIZE + self::LABEL_MARGIN)
+                       + (self::FIELD_SIZE + self::FIELD_MARGIN);
+
+        $baseHeight = $fieldCount * $perFieldHeight;
+        $scale = 1.0;
+        if ($baseHeight > $usableHeight && $baseHeight > 0) {
+            $scale = $usableHeight / $baseHeight;
+        }
+
+        $labelSize   = self::LABEL_SIZE   * $scale;
+        $labelMargin = self::LABEL_MARGIN * $scale;
+        $fieldSize   = self::FIELD_SIZE   * $scale;
+        $fieldMargin = self::FIELD_MARGIN * $scale;
+
+        foreach ($fields as $field) {
             static::writeText(
                 $pdf, $field['label'],
                 $currentX, $currentY,
-                'freesans', '', self::LABEL_SIZE, 'L',
-                $usableWidth, self::LABEL_SIZE, true, 0
+                'freesans', '', $labelSize, 'L',
+                $usableWidth, $labelSize, true, 0
             );
-            $currentY += self::LABEL_SIZE + self::LABEL_MARGIN;
+            $currentY += $labelSize + $labelMargin;
 
             static::writeText(
                 $pdf, $field['value'],
                 $currentX, $currentY,
-                'freemono', 'B', self::FIELD_SIZE, 'L',
-                $usableWidth, self::FIELD_SIZE, true, 0, 0.01
+                'freemono', 'B', $fieldSize, 'L',
+                $usableWidth, $fieldSize, true, 0, 0.01
             );
-            $currentY += self::FIELD_SIZE + self::FIELD_MARGIN;
+            $currentY += $fieldSize + $fieldMargin;
         }
 
     }

app/Models/Labels/Sheets/Avery/L6009_A.php

@@ -59,23 +59,44 @@ class L6009_A extends L6009
             $currentX += $barcodeSize + self::BARCODE_MARGIN;
             $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
         }
+        $fields = $record->get('fields');
+        // Below rescales the size of the field box to fit, it feels like it could/should be abstracted one class above
+        // to be usable on other labels but im unsure of how to implement that, since it uses a lot of private
+        // constants.
 
-        foreach ($record->get('fields') as $field) {
+        // Figure out how tall the label fields wants to be
+        $fieldCount = count($fields);
+        $perFieldHeight = (self::LABEL_SIZE + self::LABEL_MARGIN)
+                        + (self::FIELD_SIZE + self::FIELD_MARGIN);
+
+        $baseHeight = $fieldCount * $perFieldHeight;
+        // If it doesn't fit in the available height, scale everything down
+        $scale = 1.0;
+        if ($baseHeight > $usableHeight && $baseHeight > 0) {
+            $scale = $usableHeight / $baseHeight;
+        }
+
+        $labelSize   = self::LABEL_SIZE   * $scale;
+        $labelMargin = self::LABEL_MARGIN * $scale;
+        $fieldSize   = self::FIELD_SIZE   * $scale;
+        $fieldMargin = self::FIELD_MARGIN * $scale;
+
+        foreach ($fields as $field) {
             static::writeText(
                 $pdf, $field['label'],
                 $currentX, $currentY,
-                'freesans', '', self::LABEL_SIZE, 'L',
-                $usableWidth, self::LABEL_SIZE, true, 0
+                'freesans', '', $labelSize, 'L',
+                $usableWidth, $labelSize, true, 0
             );
-            $currentY += self::LABEL_SIZE + self::LABEL_MARGIN;
+            $currentY += $labelSize + $labelMargin;
 
             static::writeText(
                 $pdf, $field['value'],
                 $currentX, $currentY,
-                'freemono', 'B', self::FIELD_SIZE, 'L',
-                $usableWidth, self::FIELD_SIZE, true, 0, 0.01
+                'freemono', 'B', $fieldSize, 'L',
+                $usableWidth, $fieldSize, true, 0, 0.01
             );
-            $currentY += self::FIELD_SIZE + self::FIELD_MARGIN;
+            $currentY += $fieldSize + $fieldMargin;
         }
     }
 }

config/filesystems.php

@@ -63,6 +63,8 @@ $config = [
             'region' => env('PUBLIC_AWS_DEFAULT_REGION'),
             'bucket' => env('PUBLIC_AWS_BUCKET'),
             'url' => env('PUBLIC_AWS_URL'),
+            'endpoint' => env('PUBLIC_AWS_ENDPOINT'),
+            'use_path_style_endpoint' => env('PUBLIC_AWS_PATH_STYLE'),
             'root'   => env('PUBLIC_AWS_BUCKET_ROOT'),
             'visibility' => 'public'
         ],
@@ -78,6 +80,8 @@ $config = [
             'region' => env('PRIVATE_AWS_DEFAULT_REGION'),
             'bucket' => env('PRIVATE_AWS_BUCKET'),
             'url' => env('PRIVATE_AWS_URL'),
+            'endpoint' => env('PRIVATE_AWS_ENDPOINT'),
+            'use_path_style_endpoint' => env('PRIVATE_AWS_PATH_STYLE'),
             'root'   => env('PRIVATE_AWS_BUCKET_ROOT'),
             'visibility' => 'private'
         ],
@@ -168,4 +172,4 @@ $config['allowed_upload_mimetypes'] = implode(',', $config['allowed_upload_mimet
 $config['allowed_upload_extensions_for_validator'] = implode(',', $config['allowed_upload_extensions_array']);
 $config['allowed_upload_extensions'] = '.'.implode(', .', $config['allowed_upload_extensions_array']);
 
-return $config;
+return $config;

upgrade.php

@@ -79,6 +79,7 @@ echo "This script will attempt to: \n\n";
 echo "- validate some very basic .env file settings \n";
 echo "- check your PHP version and extension requirements \n";
 echo "- check directory permissions \n";
+echo "- change your 'git remote' to the new Snipe-IT GitHub URL \n";
 echo "- do a git pull to bring you to the latest version \n";
 echo "- run composer install to get your vendors up to date \n";
 echo "- run a backup \n";
@@ -437,6 +438,30 @@ $git_version = shell_exec('git --version');
 
 if ((strpos('git version', $git_version)) === false) {
     echo "Git is installed. \n";
+
+    // check remotes for legacy snipe/snipe-it URL
+    $remote = shell_exec('git remote -v');
+    foreach (explode("\n", $remote) as $line) {
+        $remote_bits = explode("\t", $line, 2);
+        if (count($remote_bits) != 2) {
+            continue;
+        }
+        @list($url, $purpose) = explode(" ", $remote_bits[1]);
+        if (in_array($url, ['git@github.com:snipe/snipe-it.git', 'https://github.com/snipe/snipe-it.git'])) {
+            // SSH or HTTPS remotes
+            $new_url = preg_replace("|snipe/snipe-it|", "grokability/snipe-it", $url);
+            echo $success_icon . " Resetting remote " . $remote_bits[0] . " at $url to $new_url for purpose: $purpose\n";
+            $push = '';
+            if ($purpose == '(push)') {
+                $push = '--push ';
+            }
+            $cmd = "git remote set-url $push" . $remote_bits[0] . " " . $new_url;
+            $remote_reset = shell_exec($cmd);
+            if ($remote_reset) {
+                echo '-- ' . $remote_reset . "\n";
+            }
+        }
+    }
     $git_fetch = shell_exec('git fetch');
     $git_checkout = shell_exec('git checkout '.$branch);
     $git_stash = shell_exec('git stash');