deon/pla-version
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement version table, update APIs when getting version info from github because the tags API was not retrieving our current git tags
All checks were successful
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m26s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 9s
Details
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 27s
Details

Browse Source
This commit is contained in:
Deon George
2025-03-09 21:54:23 +11:00
parent e6827082cb
commit 2d3ca833f9
6 changed files with 112 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/Http/Controllers/VersionController.php
View File

@@ -9,6 +9,7 @@ use Illuminate\Support\Str;
use App\Models\Site;
use App\Models\SiteVersion;
use App\Models\Version;
class VersionController extends Controller
{
@@ -20,7 +21,7 @@ class VersionController extends Controller
private const VERSION_REGEX = '/^v([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?)-([a-z]{3})-([a-z0-9]{8})$/';
public function main(Request $request,string $version=NULL) {
public function main(Request $request,?string $version=NULL) {
// Our version is in the format of either:
// v1.2.3-xxx-abcdef01
Log::info(sprintf('Connection from [%s] reporting version [%s]',$this->getUserIpAddr(),$version));
@@ -31,9 +32,11 @@ class VersionController extends Controller
'ip_address'=>$this->getUserIpAddr()
]);
$vo = new SiteVersion;
$vo->version = $version;
$so->versions()->save($vo);
$vo = Version::firstOrCreate(['version'=>$version]);
$sv = new SiteVersion;
$sv->version_id = $vo->id;
$so->versions()->save($sv);
// If xxx is "dev" we are a development version
switch($matches[3]) {
@@ -69,30 +72,30 @@ class VersionController extends Controller
case 'rel':
$current = Cache::remember('rel',self::CACHE_TIME,function() {
$client = new Client;
$url = sprintf('%s/%s/tags',self::GH_URL,self::GH_PROJECT);
$url = sprintf('%s/%s/releases/latest',self::GH_URL,self::GH_PROJECT);
// Find the tag associated with version $matches[1] and see if there is a more recent version number
$response = $client->request('GET',$url,['form_params'=>['ref_name'=>'master','sort'=>'desc']]);
$response = $client->request('GET',$url);
if ($response->getStatusCode() === 200) {
$result = collect(json_decode($response->getBody()));
return $result->first();
return $result;
}
return NULL;
});
if ($current) {
$sha = Str::limit($current->commit->sha,8,NULL);
$repository = sprintf('v%s-rel-%s',$current->name,$sha);
$repository = sprintf('v%s',$current->get('tag_name'));
$sha = $this->get_sha($current->get('tag_name'));
// If $matches[1] is smaller, "upgrade available"
if ($matches[1] < $current->name)
if ($matches[1] < $current->get('tag_name'))
$response = ['action'=>'upgrade','version'=>$repository];
// If $matches[1] is the same, validate that $matches[4] is current and the same and if not, error
elseif ($matches[1] === $current->name)
elseif ($matches[1] === $current->get('tag_name'))
$response = ($matches[4] === $sha) ? ['action'=>'current','version'=>$repository] : ['action'=>'mismatch','version'=>$repository];
// if $matches[1] is higher, abort
@@ -105,8 +108,8 @@ class VersionController extends Controller
break;
}
$vo->response = $response;
$vo->save();
$sv->response = $response;
$sv->save();
return $response;
}
@@ -115,6 +118,25 @@ class VersionController extends Controller
return ['action'=>'invalid','version'=>'vn.n.n-xxxx-hhhhhhhh'];
}
private function get_sha(string $tag): ?string
{
return Cache::remember($tag,self::CACHE_TIME,function() use ($tag){
$url = sprintf('%s/%s/git/ref/tags/%s',self::GH_URL,self::GH_PROJECT,$tag);
// Find the tag associated with version $matches[1] and see if there is a more recent version number
$client = new Client;
$response = $client->request('GET',$url);
if ($response->getStatusCode() === 200) {
$result = collect(json_decode($response->getBody()));
return substr($result->get('object')->sha,0,8);
}
return NULL;
});
}
public function getUserIpAddr(): string
{
if (isset($_SERVER['HTTP_CLIENT_IP']))